From b7619516fab00e7891fcac52e7eeff4e88ab2072 Mon Sep 17 00:00:00 2001 From: Steve McIntyre Date: Sun, 3 Jan 2016 13:07:12 +0000 Subject: [PATCH] Backport again: Change wget usage to make option handling easier Switch all usage to $WGET, then set WGET in CONF.sh First usage is to add --ca-directory /etc/ssl/ca-debian/ so https certificates work. --- CONF.sh | 5 +++++ debian/changelog | 3 ++- tools/boot/jessie/boot-alpha | 2 +- tools/boot/jessie/boot-arm | 6 +++--- tools/boot/jessie/boot-arm64 | 2 +- tools/boot/jessie/boot-hppa | 2 +- tools/boot/jessie/boot-hurd | 2 +- tools/boot/jessie/boot-ia64 | 4 ++-- tools/boot/jessie/boot-kfreebsd | 2 +- tools/boot/jessie/boot-m68k | 2 +- tools/boot/jessie/boot-mips | 4 ++-- tools/boot/jessie/boot-mipsel | 8 ++++---- tools/boot/jessie/boot-powerpc | 4 ++-- tools/boot/jessie/boot-ppc64el | 2 +- tools/boot/jessie/boot-s390x | 2 +- tools/boot/jessie/boot-sparc | 6 +++--- tools/boot/jessie/boot-x86 | 6 +++--- tools/boot/wheezy/boot-alpha | 2 +- tools/boot/wheezy/boot-hppa | 2 +- tools/boot/wheezy/boot-hurd | 2 +- tools/boot/wheezy/boot-ia64 | 4 ++-- tools/boot/wheezy/boot-kfreebsd | 2 +- tools/boot/wheezy/boot-m68k | 2 +- tools/boot/wheezy/boot-mips | 4 ++-- tools/boot/wheezy/boot-mipsel | 8 ++++---- tools/boot/wheezy/boot-powerpc | 4 ++-- tools/boot/wheezy/boot-s390-common | 2 +- tools/boot/wheezy/boot-sparc | 6 +++--- tools/boot/wheezy/boot-x86 | 6 +++--- tools/jessie/installtools.sh | 2 +- tools/wheezy/installtools.sh | 2 +- 31 files changed, 58 insertions(+), 52 deletions(-) diff --git a/CONF.sh b/CONF.sh index 74b81d18..b689979b 100644 --- a/CONF.sh +++ b/CONF.sh @@ -410,6 +410,11 @@ case "$OFFICIAL" in ;; esac +# Add options to wget to include support for the Debian CA, so +# https://d-i.debian.org et al will work. +export WGET_OPTS="--ca-directory /etc/ssl/ca-debian/" +export WGET="wget $WGET_OPTS" + # Set this to force the Release file(s) to say "stable". Used in first # Etch builds to allow us to build before the archive updated #EARLY_BUILD_HACK=1 diff --git a/debian/changelog b/debian/changelog index 725b2f97..839a7a8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,7 +23,8 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium - Drop the d390oco loader from and jessie + include espeakup on cd1, not speakup, and alsa-utils. Closes: #809497 + Switch references to d-i.debian.org to use https instead of http. - Closes: #809698 + Closes: #809698. Also use --ca-directory /etc/ssl/ca-debian/ with wget + to ensure this works. -- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100 diff --git a/tools/boot/jessie/boot-alpha b/tools/boot/jessie/boot-alpha index 762ae2eb..1cfadee9 100755 --- a/tools/boot/jessie/boot-alpha +++ b/tools/boot/jessie/boot-alpha @@ -70,7 +70,7 @@ for image in initrd.gz vmlinuz; do ab_file=`ls "$DI_DIR"/$image* | tail -1` cp "$ab_file" . else - wget "$DI_WWW_HOME/$image" + $WGET "$DI_WWW_HOME/$image" fi fi done diff --git a/tools/boot/jessie/boot-arm b/tools/boot/jessie/boot-arm index 7d729f61..34383b90 100755 --- a/tools/boot/jessie/boot-arm +++ b/tools/boot/jessie/boot-arm @@ -64,7 +64,7 @@ if [ ! "$DI_WWW_HOME" ];then fi cp "$DI_DIR/MANIFEST" MANIFEST else - wget "$DI_WWW_HOME/MANIFEST" -O MANIFEST + $WGET "$DI_WWW_HOME/MANIFEST" -O MANIFEST fi for image in $(awk '{print $1}' MANIFEST); do @@ -79,12 +79,12 @@ for image in $(awk '{print $1}' MANIFEST); do fi cp -a "$DI_DIR/$image" "$image" else - wget --no-parent -r -nH --cut-dirs=3 "$DI_WWW_HOME/$image" + $WGET --no-parent -r -nH --cut-dirs=3 "$DI_WWW_HOME/$image" fi fi done -# Clean up in case we had to use wget :-( +# Clean up in case we had to use $WGET :-( find . -name 'index.html*' -delete exit 0 diff --git a/tools/boot/jessie/boot-arm64 b/tools/boot/jessie/boot-arm64 index 66e2815f..fd736abf 100755 --- a/tools/boot/jessie/boot-arm64 +++ b/tools/boot/jessie/boot-arm64 @@ -60,7 +60,7 @@ for image in $BOOT_IMAGES; do fi cp "$DI_DIR/$image" "$image" else - wget "$DI_WWW_HOME/$image" -O "$image" + $WGET "$DI_WWW_HOME/$image" -O "$image" fi fi done diff --git a/tools/boot/jessie/boot-hppa b/tools/boot/jessie/boot-hppa index 8e66f501..597c0b22 100755 --- a/tools/boot/jessie/boot-hppa +++ b/tools/boot/jessie/boot-hppa @@ -44,7 +44,7 @@ if [ ! "$DI_WWW_HOME" ];then else DI_DIR="di_stuff" mkdir "$DI_DIR" - wget -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME" + $WGET -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME" fi K32=$(basename "$DI_DIR"/vmlinux-*-parisc) diff --git a/tools/boot/jessie/boot-hurd b/tools/boot/jessie/boot-hurd index f64b091d..344ede5a 100644 --- a/tools/boot/jessie/boot-hurd +++ b/tools/boot/jessie/boot-hurd @@ -51,7 +51,7 @@ for image in $BOOT_IMAGES; do fi cp "$DI_DIR/$image" $image else - wget "$DI_WWW_HOME/$image" -O $image + $WGET "$DI_WWW_HOME/$image" -O $image fi fi done diff --git a/tools/boot/jessie/boot-ia64 b/tools/boot/jessie/boot-ia64 index 24cd5f8c..6d3fa986 100755 --- a/tools/boot/jessie/boot-ia64 +++ b/tools/boot/jessie/boot-ia64 @@ -35,8 +35,8 @@ for image in boot.img; do cp "$DI_DIR/cdrom/$image" . || \ cp "$DI_DIR/$image" . else - wget "$DI_WWW_HOME/cdrom/$image" || \ - wget "$DI_WWW_HOME/$image" + $WGET "$DI_WWW_HOME/cdrom/$image" || \ + $WGET "$DI_WWW_HOME/$image" fi fi done diff --git a/tools/boot/jessie/boot-kfreebsd b/tools/boot/jessie/boot-kfreebsd index eae3695b..e9d0a336 100644 --- a/tools/boot/jessie/boot-kfreebsd +++ b/tools/boot/jessie/boot-kfreebsd @@ -62,7 +62,7 @@ for image in $BOOT_IMAGES; do fi cp "$DI_DIR/$image" $image || true else - wget "$DI_WWW_HOME/$image" -O $image + $WGET "$DI_WWW_HOME/$image" -O $image fi fi done diff --git a/tools/boot/jessie/boot-m68k b/tools/boot/jessie/boot-m68k index d71d8689..3183a09c 100755 --- a/tools/boot/jessie/boot-m68k +++ b/tools/boot/jessie/boot-m68k @@ -65,7 +65,7 @@ if [ ! "$DI_WWW_HOME" ];then fi cp -a $DI_DIR/* . else - wget -q -np -nH --cut-dirs=4 -r -l 3 -R '.gif,.log,stats.txt,index*' "$DI_WWW_HOME" + $WGET -q -np -nH --cut-dirs=4 -r -l 3 -R '.gif,.log,stats.txt,index*' "$DI_WWW_HOME" fi # amiga specific stuff diff --git a/tools/boot/jessie/boot-mips b/tools/boot/jessie/boot-mips index 23e68fed..f9be0ae0 100755 --- a/tools/boot/jessie/boot-mips +++ b/tools/boot/jessie/boot-mips @@ -31,9 +31,9 @@ if [ ! "$DI_WWW_HOME" ];then fi else DI_DIR="di_stuff" - wget -P "$DI_DIR/r4k-ip22" "$DI_WWW_HOME/r4k-ip22/cdrom-boot.img" + $WGET -P "$DI_DIR/r4k-ip22" "$DI_WWW_HOME/r4k-ip22/cdrom-boot.img" # r5k-ip32 has no cdrom boot image yet -# wget -P "$DI_DIR/r5k-ip32" "$DI_WWW_HOME/r5k-ip32/cdrom-boot.img" +# $WGET -P "$DI_DIR/r5k-ip32" "$DI_WWW_HOME/r5k-ip32/cdrom-boot.img" fi install -m 644 -D "$DI_DIR"/r4k-ip22/cdrom-boot.img "$CDROOT"/install/r4k-ip22-boot.img #r5k-ip32 has no cdrom boot image yet diff --git a/tools/boot/jessie/boot-mipsel b/tools/boot/jessie/boot-mipsel index d89f890b..379df7cf 100755 --- a/tools/boot/jessie/boot-mipsel +++ b/tools/boot/jessie/boot-mipsel @@ -64,12 +64,12 @@ if [ ! "$DI_WWW_HOME" ];then fi else DI_DIR="." - wget "$DI_WWW_HOME" -O di.dir + $WGET "$DI_WWW_HOME" -O di.dir r3k=$(sed -n 's/.*a href="\(vmlinux-.*-r3k-kn02\)".*/\1/ip' di.dir) r4k=$(sed -n 's/.*a href="\(vmlinux-.*-r4k-kn04\)".*/\1/ip' di.dir) - wget "$DI_WWW_HOME/$r3k" -O vmlinux-x-r3k-kn02 - wget "$DI_WWW_HOME/$r4k" -O vmlinux-x-r4k-kn04 - wget "$DI_WWW_HOME/initrd.gz" + $WGET "$DI_WWW_HOME/$r3k" -O vmlinux-x-r3k-kn02 + $WGET "$DI_WWW_HOME/$r4k" -O vmlinux-x-r4k-kn04 + $WGET "$DI_WWW_HOME/initrd.gz" fi cp "$DI_DIR"/initrd.gz "$CDROOT/boot/initrd.gz" cp "$DI_DIR"/vmlinux-*-r3k-kn02 "$CDROOT/boot/vmlinux-r3k-kn02" diff --git a/tools/boot/jessie/boot-powerpc b/tools/boot/jessie/boot-powerpc index b4bbba9a..6905f844 100755 --- a/tools/boot/jessie/boot-powerpc +++ b/tools/boot/jessie/boot-powerpc @@ -118,8 +118,8 @@ do cp -a "$DI_DIR/$subarch/cdrom${bitness}" "$subarch" fi else - if ! wget -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom/" && [ "$bitness" ]; then - wget -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom${bitness}/" + if ! $WGET -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom/" && [ "$bitness" ]; then + $WGET -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom${bitness}/" fi fi diff --git a/tools/boot/jessie/boot-ppc64el b/tools/boot/jessie/boot-ppc64el index aa6feda9..6afa287f 100755 --- a/tools/boot/jessie/boot-ppc64el +++ b/tools/boot/jessie/boot-ppc64el @@ -53,7 +53,7 @@ for image in $BOOT_IMAGES; do fi cp "$DI_DIR/$image" "$image" else - wget "$DI_WWW_HOME/$image" -O "$image" + $WGET "$DI_WWW_HOME/$image" -O "$image" fi fi done diff --git a/tools/boot/jessie/boot-s390x b/tools/boot/jessie/boot-s390x index f9b40dd4..16ac083d 100755 --- a/tools/boot/jessie/boot-s390x +++ b/tools/boot/jessie/boot-s390x @@ -73,7 +73,7 @@ for image in $images_S390; do fi cp "$DI_DIR/$image" "$imagedest" else - wget "$DI_WWW_HOME/$image" -O "$imagedest" + $WGET "$DI_WWW_HOME/$image" -O "$imagedest" fi done diff --git a/tools/boot/jessie/boot-sparc b/tools/boot/jessie/boot-sparc index fea5bac4..96d309c8 100755 --- a/tools/boot/jessie/boot-sparc +++ b/tools/boot/jessie/boot-sparc @@ -75,10 +75,10 @@ if [ ! "$DI_WWW_HOME" ];then else DI_DIR="cdrom" mkdir "./$DI_DIR" - wget "$DI_WWW_HOME" -O ./$DI_DIR/di.dir + $WGET "$DI_WWW_HOME" -O ./$DI_DIR/di.dir sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/ip' ./$DI_DIR/di.dir) - wget "$DI_WWW_HOME/$sparc64" -O ./$DI_DIR/vmlinuz-x-sparc64 - wget "$DI_WWW_HOME/initrd.gz" -O ./$DI_DIR/initrd.gz + $WGET "$DI_WWW_HOME/$sparc64" -O ./$DI_DIR/vmlinuz-x-sparc64 + $WGET "$DI_WWW_HOME/initrd.gz" -O ./$DI_DIR/initrd.gz fi if [ ! -e "$DI_DIR"/initrd.gz ] ; then diff --git a/tools/boot/jessie/boot-x86 b/tools/boot/jessie/boot-x86 index d760106b..a8d9e1fe 100644 --- a/tools/boot/jessie/boot-x86 +++ b/tools/boot/jessie/boot-x86 @@ -97,7 +97,7 @@ for image in $BOOT_IMAGES; do # echo "Copying images from $DI_DIR" cp "$DI_DIR/$image" "$image" else - wget "$DI_WWW_HOME/$image" -O "$image" + $WGET "$DI_WWW_HOME/$image" -O "$image" fi fi done @@ -115,7 +115,7 @@ for image in $DISK_IMAGES $EXTRA_DISK_IMAGES; do fi cp "$DI_DIR/$image" "$image" || true else - wget "$DI_WWW_HOME/$image" -O "$image" || rm -f "$image" + $WGET "$DI_WWW_HOME/$image" -O "$image" || rm -f "$image" fi fi done @@ -154,7 +154,7 @@ extra_image () { fi cp "$DI_DIR/cdrom/$image" $CDDIR/$INSTALLDIR/"$image" else - wget "$DI_WWW_HOME/cdrom/$image" -O $CDDIR/$INSTALLDIR/"$image" + $WGET "$DI_WWW_HOME/cdrom/$image" -O $CDDIR/$INSTALLDIR/"$image" fi fi for doppelganger in $doppelgangers ; do diff --git a/tools/boot/wheezy/boot-alpha b/tools/boot/wheezy/boot-alpha index d077b608..4007f951 100755 --- a/tools/boot/wheezy/boot-alpha +++ b/tools/boot/wheezy/boot-alpha @@ -75,7 +75,7 @@ for image in initrd.gz vmlinuz; do fi cp "$DI_DIR/$image" . else - wget "$DI_WWW_HOME/$image" + $WGET "$DI_WWW_HOME/$image" fi fi done diff --git a/tools/boot/wheezy/boot-hppa b/tools/boot/wheezy/boot-hppa index a283acd4..9ec2939a 100755 --- a/tools/boot/wheezy/boot-hppa +++ b/tools/boot/wheezy/boot-hppa @@ -50,7 +50,7 @@ if [ ! "$DI_WWW_HOME" ];then else DI_DIR="di_stuff" mkdir "$DI_DIR" - wget -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME" + $WGET -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME" fi cp "$DI_DIR"/vmlinux-*-parisc "$CDROOT/install" diff --git a/tools/boot/wheezy/boot-hurd b/tools/boot/wheezy/boot-hurd index fbb51287..a46b1f3b 100644 --- a/tools/boot/wheezy/boot-hurd +++ b/tools/boot/wheezy/boot-hurd @@ -48,7 +48,7 @@ for image in $BOOT_IMAGES; do fi cp "$DI_DIR/$image" $image else - wget "$DI_WWW_HOME/$image" -O $image + $WGET "$DI_WWW_HOME/$image" -O $image fi fi done diff --git a/tools/boot/wheezy/boot-ia64 b/tools/boot/wheezy/boot-ia64 index 204d970d..2e2f5c0b 100755 --- a/tools/boot/wheezy/boot-ia64 +++ b/tools/boot/wheezy/boot-ia64 @@ -41,8 +41,8 @@ for image in boot.img; do cp "$DI_DIR/cdrom/$image" . || \ cp "$DI_DIR/$image" . else - wget "$DI_WWW_HOME/cdrom/$image" || \ - wget "$DI_WWW_HOME/$image" + $WGET "$DI_WWW_HOME/cdrom/$image" || \ + $WGET "$DI_WWW_HOME/$image" fi fi done diff --git a/tools/boot/wheezy/boot-kfreebsd b/tools/boot/wheezy/boot-kfreebsd index ba5a4a85..ec0256ea 100644 --- a/tools/boot/wheezy/boot-kfreebsd +++ b/tools/boot/wheezy/boot-kfreebsd @@ -56,7 +56,7 @@ for image in $BOOT_IMAGES; do fi cp "$DI_DIR/$image" $image || true else - wget "$DI_WWW_HOME/$image" -O $image + $WGET "$DI_WWW_HOME/$image" -O $image fi fi done diff --git a/tools/boot/wheezy/boot-m68k b/tools/boot/wheezy/boot-m68k index fcd19c3e..cbab5dc3 100755 --- a/tools/boot/wheezy/boot-m68k +++ b/tools/boot/wheezy/boot-m68k @@ -68,7 +68,7 @@ if [ ! "$DI_WWW_HOME" ];then fi cp -a $DI_DIR/* . else - wget -q -np -nH --cut-dirs=4 -r -l 3 -R '.gif,.log,stats.txt,index*' "$DI_WWW_HOME" + $WGET -q -np -nH --cut-dirs=4 -r -l 3 -R '.gif,.log,stats.txt,index*' "$DI_WWW_HOME" fi # amiga specific stuff diff --git a/tools/boot/wheezy/boot-mips b/tools/boot/wheezy/boot-mips index a4318c6a..60f028ca 100755 --- a/tools/boot/wheezy/boot-mips +++ b/tools/boot/wheezy/boot-mips @@ -37,9 +37,9 @@ if [ ! "$DI_WWW_HOME" ];then fi else DI_DIR="di_stuff" - wget -P "$DI_DIR/r4k-ip22" "$DI_WWW_HOME/r4k-ip22/cdrom-boot.img" + $WGET -P "$DI_DIR/r4k-ip22" "$DI_WWW_HOME/r4k-ip22/cdrom-boot.img" # r5k-ip32 has no cdrom boot image yet -# wget -P "$DI_DIR/r5k-ip32" "$DI_WWW_HOME/r5k-ip32/cdrom-boot.img" +# $WGET -P "$DI_DIR/r5k-ip32" "$DI_WWW_HOME/r5k-ip32/cdrom-boot.img" fi install -m 644 -D "$DI_DIR"/r4k-ip22/cdrom-boot.img "$CDROOT"/install/r4k-ip22-boot.img #r5k-ip32 has no cdrom boot image yet diff --git a/tools/boot/wheezy/boot-mipsel b/tools/boot/wheezy/boot-mipsel index 9a90c7d3..1e3077b9 100755 --- a/tools/boot/wheezy/boot-mipsel +++ b/tools/boot/wheezy/boot-mipsel @@ -70,12 +70,12 @@ if [ ! "$DI_WWW_HOME" ];then fi else DI_DIR="." - wget "$DI_WWW_HOME" -O di.dir + $WGET "$DI_WWW_HOME" -O di.dir r3k=$(sed -n 's/.*a href="\(vmlinux-.*-r3k-kn02\)".*/\1/ip' di.dir) r4k=$(sed -n 's/.*a href="\(vmlinux-.*-r4k-kn04\)".*/\1/ip' di.dir) - wget "$DI_WWW_HOME/$r3k" -O vmlinux-x-r3k-kn02 - wget "$DI_WWW_HOME/$r4k" -O vmlinux-x-r4k-kn04 - wget "$DI_WWW_HOME/initrd.gz" + $WGET "$DI_WWW_HOME/$r3k" -O vmlinux-x-r3k-kn02 + $WGET "$DI_WWW_HOME/$r4k" -O vmlinux-x-r4k-kn04 + $WGET "$DI_WWW_HOME/initrd.gz" fi cp "$DI_DIR"/initrd.gz "$CDROOT/boot/initrd.gz" cp "$DI_DIR"/vmlinux-*-r3k-kn02 "$CDROOT/boot/vmlinux-r3k-kn02" diff --git a/tools/boot/wheezy/boot-powerpc b/tools/boot/wheezy/boot-powerpc index 7eae8c32..2cb1dd26 100755 --- a/tools/boot/wheezy/boot-powerpc +++ b/tools/boot/wheezy/boot-powerpc @@ -124,8 +124,8 @@ do cp -a "$DI_DIR/$subarch/cdrom${bitness}" "$subarch" fi else - if ! wget -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom/" && [ "$bitness" ]; then - wget -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom${bitness}/" + if ! $WGET -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom/" && [ "$bitness" ]; then + $WGET -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom${bitness}/" fi fi diff --git a/tools/boot/wheezy/boot-s390-common b/tools/boot/wheezy/boot-s390-common index 04122085..f8df46a3 100644 --- a/tools/boot/wheezy/boot-s390-common +++ b/tools/boot/wheezy/boot-s390-common @@ -85,7 +85,7 @@ for image in $images_S390; do fi cp "$DI_DIR/$image" "$imagedest" else - wget "$DI_WWW_HOME/$image" -O "$imagedest" + $WGET "$DI_WWW_HOME/$image" -O "$imagedest" fi done diff --git a/tools/boot/wheezy/boot-sparc b/tools/boot/wheezy/boot-sparc index 1078b34b..3f15f445 100755 --- a/tools/boot/wheezy/boot-sparc +++ b/tools/boot/wheezy/boot-sparc @@ -81,10 +81,10 @@ if [ ! "$DI_WWW_HOME" ];then else DI_DIR="cdrom" mkdir "./$DI_DIR" - wget "$DI_WWW_HOME" -O ./$DI_DIR/di.dir + $WGET "$DI_WWW_HOME" -O ./$DI_DIR/di.dir sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/ip' ./$DI_DIR/di.dir) - wget "$DI_WWW_HOME/$sparc64" -O ./$DI_DIR/vmlinuz-x-sparc64 - wget "$DI_WWW_HOME/initrd.gz" -O ./$DI_DIR/initrd.gz + $WGET "$DI_WWW_HOME/$sparc64" -O ./$DI_DIR/vmlinuz-x-sparc64 + $WGET "$DI_WWW_HOME/initrd.gz" -O ./$DI_DIR/initrd.gz fi if [ ! -e "$DI_DIR"/initrd.gz ] ; then diff --git a/tools/boot/wheezy/boot-x86 b/tools/boot/wheezy/boot-x86 index 1fb90731..4143b04b 100644 --- a/tools/boot/wheezy/boot-x86 +++ b/tools/boot/wheezy/boot-x86 @@ -88,7 +88,7 @@ for image in $BOOT_IMAGES; do # echo "Copying images from $DI_DIR" cp "$DI_DIR/$image" "$image" else - wget "$DI_WWW_HOME/$image" -O "$image" + $WGET "$DI_WWW_HOME/$image" -O "$image" fi fi done @@ -106,7 +106,7 @@ for image in $DISK_IMAGES $EXTRA_DISK_IMAGES; do fi cp "$DI_DIR/$image" "$image" || true else - wget "$DI_WWW_HOME/$image" -O "$image" || rm -f "$image" + $WGET "$DI_WWW_HOME/$image" -O "$image" || rm -f "$image" fi fi done @@ -145,7 +145,7 @@ extra_image () { fi cp "$DI_DIR/cdrom/$image" $CDDIR/$INSTALLDIR/"$image" else - wget "$DI_WWW_HOME/cdrom/$image" -O $CDDIR/$INSTALLDIR/"$image" + $WGET "$DI_WWW_HOME/cdrom/$image" -O $CDDIR/$INSTALLDIR/"$image" fi fi for doppelganger in $doppelgangers ; do diff --git a/tools/jessie/installtools.sh b/tools/jessie/installtools.sh index ba54c6ec..d7928ef5 100755 --- a/tools/jessie/installtools.sh +++ b/tools/jessie/installtools.sh @@ -59,7 +59,7 @@ if [ "$OMIT_RELEASE_NOTES" != 1 ]; then mkdir -p $RN cd $RN echo "Downloading most recent release notes for $ARCH" - wget $RELEASE_NOTES_LOCATION/release-notes-$ARCH.tar.gz + $WGET $RELEASE_NOTES_LOCATION/release-notes-$ARCH.tar.gz if [ -e release-notes-$ARCH.tar.gz ] ; then tar xzvf release-notes-$ARCH.tar.gz rm -f release-notes-$ARCH.tar.gz diff --git a/tools/wheezy/installtools.sh b/tools/wheezy/installtools.sh index ba54c6ec..d7928ef5 100755 --- a/tools/wheezy/installtools.sh +++ b/tools/wheezy/installtools.sh @@ -59,7 +59,7 @@ if [ "$OMIT_RELEASE_NOTES" != 1 ]; then mkdir -p $RN cd $RN echo "Downloading most recent release notes for $ARCH" - wget $RELEASE_NOTES_LOCATION/release-notes-$ARCH.tar.gz + $WGET $RELEASE_NOTES_LOCATION/release-notes-$ARCH.tar.gz if [ -e release-notes-$ARCH.tar.gz ] ; then tar xzvf release-notes-$ARCH.tar.gz rm -f release-notes-$ARCH.tar.gz