diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 14:05:14 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:27 +0100 |
| commit | 791c256094789702c8e199ee5b3f2f5e73f186fb (patch) | |
| tree | 4e32af1b52bf44010e3414fc73808bd4af522512 | |
| parent | 783527b51a2e0f34b9fe12b738ba8419060948aa (diff) | |
| download | live-build-791c256094789702c8e199ee5b3f2f5e73f186fb.zip live-build-791c256094789702c8e199ee5b3f2f5e73f186fb.tar.gz | |
Respecting LH_QUIET for wget calls, thanks to Justin Pryzby <pryzbyj@justinpryzby.com>.
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 19d084a..6ad8e7b 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -33,6 +33,11 @@ Read_conffile config/source Read_conffile "${LH_CONFIG}" Set_defaults +if [ "${LH_QUIET}" = "enabled" ] +then + WGET_OPTIONS="${WGET_OPTIONS} --quiet" +fi + # Setting remote d-i directories case "${LH_DEBIAN_INSTALLER}" in enabled|cdrom|netinst|businesscard|live) @@ -184,15 +189,15 @@ fi # Downloading debian-installer mkdir -p "${DESTDIR_DI}" -wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI}/${DI_KERNEL} -wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI}/initrd.gz +wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI}/${DI_KERNEL} +wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI}/initrd.gz # Downloading graphical-installer if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ] then mkdir -p "${DESTDIR_GI}" - wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_GTK}/${DI_KERNEL} - wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_GTK}/initrd.gz + wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_GTK}/${DI_KERNEL} + wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_GTK}/initrd.gz fi if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then @@ -294,13 +299,13 @@ gzip -9 -c dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages > di cd "${OLDPWD}" # Fetching release -wget "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/binary-"${LH_ARCHITECTURE}"/Release -O binary/dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Release +wget ${WGET_OPTIONS} "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/binary-"${LH_ARCHITECTURE}"/Release -O binary/dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Release mkdir binary.udeb cd binary.udeb # Downloading udeb indices -wget "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"/Packages.gz +wget ${WGET_OPTIONS} "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"/Packages.gz gunzip -c Packages.gz > Packages # Sorting udebs @@ -315,7 +320,7 @@ do cp ../cache/packages_debian-installer.udeb/"`basename ${UDEB}`" ./ else # Downloading udebs - wget "${LH_MIRROR_BOOTSTRAP}"/${UDEB} + wget ${WGET_OPTIONS} "${LH_MIRROR_BOOTSTRAP}"/${UDEB} fi done |