Skip to content

Commit 96c90e8

Browse files
andrewwutwandrewwutw
committed
Use new download method.
1 parent d7c92fd commit 96c90e8

File tree

4 files changed

+52
-24
lines changed

4 files changed

+52
-24
lines changed

‎script/4.8.5

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,12 @@ fi
9595
rm test-zlib 2>/dev/null
9696
rm test-zlib.exe 2>/dev/null
9797

98+
# djcross-gcc-X.XX-tar.* maybe moved from /djgpp/rpms/ to /djgpp/deleted/rpms/ directory.
99+
OLD_DJCROSS_GCC_ARCHIVE=${DJCROSS_GCC_ARCHIVE/rpms\//deleted\/rpms\/}
100+
98101
# download source files
99102
ARCHIVE_LIST="$BINUTILS_ARCHIVE $DJCRX_ARCHIVE $DJLSR_ARCHIVE $DJDEV_ARCHIVE
100-
$SED_ARCHIVE $DJCROSS_GCC_ARCHIVE $GCC_ARCHIVE
103+
$SED_ARCHIVE $DJCROSS_GCC_ARCHIVE $OLD_DJCROSS_GCC_ARCHIVE $GCC_ARCHIVE
101104
$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE
102105
$AUTOCONF_ARCHIVE $AUTOMAKE_ARCHIVE"
103106

@@ -110,13 +113,17 @@ for ARCHIVE in $ARCHIVE_LIST; do
110113
if ! [ -f $FILE ]; then
111114
echo "Download $ARCHIVE ..."
112115
if [ ! -z $USE_WGET ]; then
113-
if ! wget -U firefox $ARCHIVE; then
114-
rm $FILE
115-
exit 1
116-
fi
116+
DL_CMD="wget -U firefox $ARCHIVE"
117117
else
118-
if ! curl -f $ARCHIVE -L -o $FILE; then
118+
DL_CMD="curl -f $ARCHIVE -L -o $FILE"
119+
fi
120+
echo "Command : $DL_CMD"
121+
if ! eval $DL_CMD; then
122+
if [ "$ARCHIVE" == "$DJCROSS_GCC_ARCHIVE" ]; then
123+
echo "$FILE maybe moved to deleted/ directory."
124+
else
119125
rm $FILE
126+
echo "Download $ARCHIVE failed."
120127
exit 1
121128
fi
122129
fi

‎script/4.9.4

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,12 @@ fi
9595
rm test-zlib 2>/dev/null
9696
rm test-zlib.exe 2>/dev/null
9797

98+
# djcross-gcc-X.XX-tar.* maybe moved from /djgpp/rpms/ to /djgpp/deleted/rpms/ directory.
99+
OLD_DJCROSS_GCC_ARCHIVE=${DJCROSS_GCC_ARCHIVE/rpms\//deleted\/rpms\/}
100+
98101
# download source files
99102
ARCHIVE_LIST="$BINUTILS_ARCHIVE $DJCRX_ARCHIVE $DJLSR_ARCHIVE $DJDEV_ARCHIVE
100-
$SED_ARCHIVE $DJCROSS_GCC_ARCHIVE $GCC_ARCHIVE
103+
$SED_ARCHIVE $DJCROSS_GCC_ARCHIVE $OLD_DJCROSS_GCC_ARCHIVE $GCC_ARCHIVE
101104
$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE
102105
$AUTOCONF_ARCHIVE $AUTOMAKE_ARCHIVE"
103106

@@ -110,13 +113,17 @@ for ARCHIVE in $ARCHIVE_LIST; do
110113
if ! [ -f $FILE ]; then
111114
echo "Download $ARCHIVE ..."
112115
if [ ! -z $USE_WGET ]; then
113-
if ! wget -U firefox $ARCHIVE; then
114-
rm $FILE
115-
exit 1
116-
fi
116+
DL_CMD="wget -U firefox $ARCHIVE"
117117
else
118-
if ! curl -f $ARCHIVE -L -o $FILE; then
118+
DL_CMD="curl -f $ARCHIVE -L -o $FILE"
119+
fi
120+
echo "Command : $DL_CMD"
121+
if ! eval $DL_CMD; then
122+
if [ "$ARCHIVE" == "$DJCROSS_GCC_ARCHIVE" ]; then
123+
echo "$FILE maybe moved to deleted/ directory."
124+
else
119125
rm $FILE
126+
echo "Download $ARCHIVE failed."
120127
exit 1
121128
fi
122129
fi

‎script/6.4.0

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,12 @@ fi
9595
rm test-zlib 2>/dev/null
9696
rm test-zlib.exe 2>/dev/null
9797

98+
# djcross-gcc-X.XX-tar.* maybe moved from /djgpp/rpms/ to /djgpp/deleted/rpms/ directory.
99+
OLD_DJCROSS_GCC_ARCHIVE=${DJCROSS_GCC_ARCHIVE/rpms\//deleted\/rpms\/}
100+
98101
# download source files
99102
ARCHIVE_LIST="$BINUTILS_ARCHIVE $DJCRX_ARCHIVE $DJLSR_ARCHIVE $DJDEV_ARCHIVE
100-
$SED_ARCHIVE $DJCROSS_GCC_ARCHIVE $GCC_ARCHIVE
103+
$SED_ARCHIVE $DJCROSS_GCC_ARCHIVE $OLD_DJCROSS_GCC_ARCHIVE $GCC_ARCHIVE
101104
$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE
102105
$AUTOCONF_ARCHIVE $AUTOMAKE_ARCHIVE"
103106

@@ -110,13 +113,17 @@ for ARCHIVE in $ARCHIVE_LIST; do
110113
if ! [ -f $FILE ]; then
111114
echo "Download $ARCHIVE ..."
112115
if [ ! -z $USE_WGET ]; then
113-
if ! wget -U firefox $ARCHIVE; then
114-
rm $FILE
115-
exit 1
116-
fi
116+
DL_CMD="wget -U firefox $ARCHIVE"
117117
else
118-
if ! curl -f $ARCHIVE -L -o $FILE; then
118+
DL_CMD="curl -f $ARCHIVE -L -o $FILE"
119+
fi
120+
echo "Command : $DL_CMD"
121+
if ! eval $DL_CMD; then
122+
if [ "$ARCHIVE" == "$DJCROSS_GCC_ARCHIVE" ]; then
123+
echo "$FILE maybe moved to deleted/ directory."
124+
else
119125
rm $FILE
126+
echo "Download $ARCHIVE failed."
120127
exit 1
121128
fi
122129
fi

‎script/7.2.0

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,12 @@ fi
9595
rm test-zlib 2>/dev/null
9696
rm test-zlib.exe 2>/dev/null
9797

98+
# djcross-gcc-X.XX-tar.* maybe moved from /djgpp/rpms/ to /djgpp/deleted/rpms/ directory.
99+
OLD_DJCROSS_GCC_ARCHIVE=${DJCROSS_GCC_ARCHIVE/rpms\//deleted\/rpms\/}
100+
98101
# download source files
99102
ARCHIVE_LIST="$BINUTILS_ARCHIVE $DJCRX_ARCHIVE $DJLSR_ARCHIVE $DJDEV_ARCHIVE
100-
$SED_ARCHIVE $DJCROSS_GCC_ARCHIVE $GCC_ARCHIVE
103+
$SED_ARCHIVE $DJCROSS_GCC_ARCHIVE $OLD_DJCROSS_GCC_ARCHIVE $GCC_ARCHIVE
101104
$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE
102105
$AUTOCONF_ARCHIVE $AUTOMAKE_ARCHIVE"
103106

@@ -110,13 +113,17 @@ for ARCHIVE in $ARCHIVE_LIST; do
110113
if ! [ -f $FILE ]; then
111114
echo "Download $ARCHIVE ..."
112115
if [ ! -z $USE_WGET ]; then
113-
if ! wget -U firefox $ARCHIVE; then
114-
rm $FILE
115-
exit 1
116-
fi
116+
DL_CMD="wget -U firefox $ARCHIVE"
117117
else
118-
if ! curl -f $ARCHIVE -L -o $FILE; then
118+
DL_CMD="curl -f $ARCHIVE -L -o $FILE"
119+
fi
120+
echo "Command : $DL_CMD"
121+
if ! eval $DL_CMD; then
122+
if [ "$ARCHIVE" == "$DJCROSS_GCC_ARCHIVE" ]; then
123+
echo "$FILE maybe moved to deleted/ directory."
124+
else
119125
rm $FILE
126+
echo "Download $ARCHIVE failed."
120127
exit 1
121128
fi
122129
fi

0 commit comments

Comments
 (0)