Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-382-g79517f1
|
From: Lawrence S. <ljs...@us...> - 2020-04-08 00:39:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".
The branch, master has been updated
via 79517f1ba522c532540b6f02a3df1f5818099be4 (commit)
via 8084918ab8038947d52b45672469c971fbaadb5b (commit)
from dccc475d238aa81c2dc4cccdf6597bfc635fcce3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 79517f1ba522c532540b6f02a3df1f5818099be4
Merge: dccc475 8084918
Author: Lawrence Sebald <ljs...@us...>
Date: Tue Apr 7 20:39:02 2020 -0400
Merge pull request #25 from einsteinx2/dc-chain-prefer-curl
Prefer curl over wget in dc-chain download script
commit 8084918ab8038947d52b45672469c971fbaadb5b
Author: Ben Baron <be...@ei...>
Date: Tue Apr 7 19:32:39 2020 -0500
Prefer curl over wget in dc-chain download script
Curl works better when building Docker images as wget prints to many lines while curl prints over the same line.
All I did was switch the order of the checks in download.sh and added the --progress-bar flag that is used in the kos-ports Makefile to get the same style of output.
-----------------------------------------------------------------------
Summary of changes:
utils/dc-chain/download.sh | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/utils/dc-chain/download.sh b/utils/dc-chain/download.sh
index a6a3f24..36b3acb 100755
--- a/utils/dc-chain/download.sh
+++ b/utils/dc-chain/download.sh
@@ -35,53 +35,53 @@ while [ "$1" != "" ]; do
done
# Download everything.
-if command -v wget >/dev/null 2>&1; then
- echo "Downloading binutils-$BINUTILS_VER..."
- wget -c https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS_VER.tar.xz || exit 1
+if command -v curl >/dev/null 2>&1; then
+ echo "Downloading Binutils $BINUTILS_VER..."
+ curl --progress-bar -C - -O https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS_VER.tar.xz || exit 1
echo "Downloading GCC $SH_GCC_VER..."
- wget -c https://ftp.gnu.org/gnu/gcc/gcc-$SH_GCC_VER/gcc-$SH_GCC_VER.tar.gz || exit 1
+ curl --progress-bar -C - -O https://ftp.gnu.org/gnu/gcc/gcc-$SH_GCC_VER/gcc-$SH_GCC_VER.tar.gz || exit 1
echo "Downloading GCC $ARM_GCC_VER..."
- wget -c https://ftp.gnu.org/gnu/gcc/gcc-$ARM_GCC_VER/gcc-$ARM_GCC_VER.tar.gz || exit 1
+ curl --progress-bar -C - -O https://ftp.gnu.org/gnu/gcc/gcc-$ARM_GCC_VER/gcc-$ARM_GCC_VER.tar.gz || exit 1
echo "Downloading Newlib $NEWLIB_VER..."
- wget -c https://sourceware.org/pub/newlib/newlib-$NEWLIB_VER.tar.gz || exit 1
+ curl --progress-bar -C - -O https://sourceware.org/pub/newlib/newlib-$NEWLIB_VER.tar.gz || exit 1
if [ -n "$GMP_VER" ]; then
echo "Downloading GMP $GMP_VER..."
- wget -c https://gcc.gnu.org/pub/gcc/infrastructure/gmp-$GMP_VER.tar.bz2 || exit 1
+ curl --progress-bar -C - -O https://gcc.gnu.org/pub/gcc/infrastructure/gmp-$GMP_VER.tar.bz2 || exit 1
fi
if [ -n "$MPFR_VER" ]; then
echo "Downloading MPFR $MPFR_VER..."
- wget -c https://gcc.gnu.org/pub/gcc/infrastructure/mpfr-$MPFR_VER.tar.bz2 || exit 1
+ curl --progress-bar -C - -O https://gcc.gnu.org/pub/gcc/infrastructure/mpfr-$MPFR_VER.tar.bz2 || exit 1
fi
if [ -n "$MPC_VER" ]; then
echo "Downloading MPC $MPC_VER..."
- wget -c https://gcc.gnu.org/pub/gcc/infrastructure/mpc-$MPC_VER.tar.gz || exit 1
+ curl --progress-bar -C - -O https://gcc.gnu.org/pub/gcc/infrastructure/mpc-$MPC_VER.tar.gz || exit 1
fi
-elif command -v curl >/dev/null 2>&1; then
- echo "Downloading Binutils $BINUTILS_VER..."
- curl -C - -O https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS_VER.tar.xz || exit 1
+elif command -v wget >/dev/null 2>&1; then
+ echo "Downloading binutils-$BINUTILS_VER..."
+ wget -c https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS_VER.tar.xz || exit 1
echo "Downloading GCC $SH_GCC_VER..."
- curl -C - -O https://ftp.gnu.org/gnu/gcc/gcc-$SH_GCC_VER/gcc-$SH_GCC_VER.tar.gz || exit 1
+ wget -c https://ftp.gnu.org/gnu/gcc/gcc-$SH_GCC_VER/gcc-$SH_GCC_VER.tar.gz || exit 1
echo "Downloading GCC $ARM_GCC_VER..."
- curl -C - -O https://ftp.gnu.org/gnu/gcc/gcc-$ARM_GCC_VER/gcc-$ARM_GCC_VER.tar.gz || exit 1
+ wget -c https://ftp.gnu.org/gnu/gcc/gcc-$ARM_GCC_VER/gcc-$ARM_GCC_VER.tar.gz || exit 1
echo "Downloading Newlib $NEWLIB_VER..."
- curl -C - -O https://sourceware.org/pub/newlib/newlib-$NEWLIB_VER.tar.gz || exit 1
+ wget -c https://sourceware.org/pub/newlib/newlib-$NEWLIB_VER.tar.gz || exit 1
if [ -n "$GMP_VER" ]; then
echo "Downloading GMP $GMP_VER..."
- curl -C - -O https://gcc.gnu.org/pub/gcc/infrastructure/gmp-$GMP_VER.tar.bz2 || exit 1
+ wget -c https://gcc.gnu.org/pub/gcc/infrastructure/gmp-$GMP_VER.tar.bz2 || exit 1
fi
if [ -n "$MPFR_VER" ]; then
echo "Downloading MPFR $MPFR_VER..."
- curl -C - -O https://gcc.gnu.org/pub/gcc/infrastructure/mpfr-$MPFR_VER.tar.bz2 || exit 1
+ wget -c https://gcc.gnu.org/pub/gcc/infrastructure/mpfr-$MPFR_VER.tar.bz2 || exit 1
fi
if [ -n "$MPC_VER" ]; then
echo "Downloading MPC $MPC_VER..."
- curl -C - -O https://gcc.gnu.org/pub/gcc/infrastructure/mpc-$MPC_VER.tar.gz || exit 1
+ wget -c https://gcc.gnu.org/pub/gcc/infrastructure/mpc-$MPC_VER.tar.gz || exit 1
fi
else
echo >&2 "You must have either wget or cURL installed to use this script!"
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
