Skip to content

Commit 01dc908

Browse files
committedMay 19, 2020
Can't download djcross-gcc-8.3.0.tar.bz2, put it in local filesystem.
It is extracted from djcross-gcc-8.3.0-1ap.src.rpm
1 parent e09ce87 commit 01dc908

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed
 

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.bz2 binary
31.5 KB
Binary file not shown.

‎script/8.3.0

+7-12
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ DJCRX_ARCHIVE="${DJGPP_DOWNLOAD_BASE}/djgpp/current/v2/djcrx${DJCRX_VERSION}.zip
5454
DJLSR_ARCHIVE="${DJGPP_DOWNLOAD_BASE}/djgpp/current/v2/djlsr${DJLSR_VERSION}.zip"
5555
DJDEV_ARCHIVE="${DJGPP_DOWNLOAD_BASE}/djgpp/current/v2/djdev${DJDEV_VERSION}.zip"
5656

57-
DJCROSS_GCC_ARCHIVE="${DJGPP_DOWNLOAD_BASE}/djgpp/rpms/djcross-gcc-${GCC_VERSION}/djcross-gcc-${GCC_VERSION}.tar.bz2"
5857
GCC_ARCHIVE="${FTPMIRROR_GNU_DOWNLOAD_BASE}/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz"
5958
GMP_ARCHIVE="${FTPMIRROR_GNU_DOWNLOAD_BASE}/gmp/gmp-${GMP_VERSION}.tar.xz"
6059
MPFR_ARCHIVE="${FTPMIRROR_GNU_DOWNLOAD_BASE}/mpfr/mpfr-${MPFR_VERSION}.tar.xz"
@@ -102,19 +101,19 @@ fi
102101
rm test-zlib 2>/dev/null
103102
rm test-zlib.exe 2>/dev/null
104103

105-
# djcross-gcc-X.XX-tar.* maybe moved from /djgpp/rpms/ to /djgpp/deleted/rpms/ directory.
106-
OLD_DJCROSS_GCC_ARCHIVE=${DJCROSS_GCC_ARCHIVE/rpms\//deleted\/rpms\/}
107-
108104
# download source files
109105
ARCHIVE_LIST="$BINUTILS_ARCHIVE $DJCRX_ARCHIVE $DJLSR_ARCHIVE $DJDEV_ARCHIVE
110-
$SED_ARCHIVE $DJCROSS_GCC_ARCHIVE $OLD_DJCROSS_GCC_ARCHIVE $GCC_ARCHIVE
106+
$SED_ARCHIVE $GCC_ARCHIVE
111107
$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE
112108
$AUTOCONF_ARCHIVE $AUTOMAKE_ARCHIVE"
113109

114110
echo "Download source files..."
115111
mkdir -p download || exit 1
116112
cd download
117113

114+
# copy local djgpp-gcc-X.XX.tar.bz2 to download/ directory
115+
cp "../missing-files/djcross-gcc-${GCC_VERSION}.tar.bz2" .
116+
118117
for ARCHIVE in $ARCHIVE_LIST; do
119118
FILE=`basename $ARCHIVE`
120119
if ! [ -f $FILE ]; then
@@ -126,13 +125,9 @@ for ARCHIVE in $ARCHIVE_LIST; do
126125
fi
127126
echo "Command : $DL_CMD"
128127
if ! eval $DL_CMD; then
129-
if [ "$ARCHIVE" == "$DJCROSS_GCC_ARCHIVE" ]; then
130-
echo "$FILE maybe moved to deleted/ directory."
131-
else
132-
rm $FILE
133-
echo "Download $ARCHIVE failed."
134-
exit 1
135-
fi
128+
rm $FILE
129+
echo "Download $ARCHIVE failed."
130+
exit 1
136131
fi
137132
fi
138133
done

0 commit comments

Comments
 (0)
Please sign in to comment.