Respecting LH_QUIET for wget calls, thanks to Justin Pryzby <pryzbyj@justinpryzby.com>.
This commit is contained in:
parent
09faf3f24b
commit
a019b98615
|
@ -33,6 +33,11 @@ Read_conffile config/source
|
||||||
Read_conffile "${LH_CONFIG}"
|
Read_conffile "${LH_CONFIG}"
|
||||||
Set_defaults
|
Set_defaults
|
||||||
|
|
||||||
|
if [ "${LH_QUIET}" = "enabled" ]
|
||||||
|
then
|
||||||
|
WGET_OPTIONS="${WGET_OPTIONS} --quiet"
|
||||||
|
fi
|
||||||
|
|
||||||
# Setting remote d-i directories
|
# Setting remote d-i directories
|
||||||
case "${LH_DEBIAN_INSTALLER}" in
|
case "${LH_DEBIAN_INSTALLER}" in
|
||||||
enabled|cdrom|netinst|businesscard|live)
|
enabled|cdrom|netinst|businesscard|live)
|
||||||
|
@ -184,15 +189,15 @@ fi
|
||||||
|
|
||||||
# Downloading debian-installer
|
# Downloading debian-installer
|
||||||
mkdir -p "${DESTDIR_DI}"
|
mkdir -p "${DESTDIR_DI}"
|
||||||
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI}/${DI_KERNEL}
|
wget ${WGET_OPTIONS} --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}"/"${INITRD_DI}" ${URL}/${DI}/initrd.gz
|
||||||
|
|
||||||
# Downloading graphical-installer
|
# Downloading graphical-installer
|
||||||
if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
|
if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
|
||||||
then
|
then
|
||||||
mkdir -p "${DESTDIR_GI}"
|
mkdir -p "${DESTDIR_GI}"
|
||||||
wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_GTK}/${DI_KERNEL}
|
wget ${WGET_OPTIONS} --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}"/"${INITRD_GI}" ${URL}/${DI_GTK}/initrd.gz
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
|
if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
|
||||||
|
@ -294,13 +299,13 @@ gzip -9 -c dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages > di
|
||||||
cd "${OLDPWD}"
|
cd "${OLDPWD}"
|
||||||
|
|
||||||
# Fetching release
|
# 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
|
mkdir binary.udeb
|
||||||
cd binary.udeb
|
cd binary.udeb
|
||||||
|
|
||||||
# Downloading udeb indices
|
# 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
|
gunzip -c Packages.gz > Packages
|
||||||
|
|
||||||
# Sorting udebs
|
# Sorting udebs
|
||||||
|
@ -315,7 +320,7 @@ do
|
||||||
cp ../cache/packages_debian-installer.udeb/"`basename ${UDEB}`" ./
|
cp ../cache/packages_debian-installer.udeb/"`basename ${UDEB}`" ./
|
||||||
else
|
else
|
||||||
# Downloading udebs
|
# Downloading udebs
|
||||||
wget "${LH_MIRROR_BOOTSTRAP}"/${UDEB}
|
wget ${WGET_OPTIONS} "${LH_MIRROR_BOOTSTRAP}"/${UDEB}
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue