From e0ad8863933ed0723aaf7f6f89011eaa3827263c Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Tue, 15 Jan 2008 19:47:50 +0000 Subject: Re-add guards against bogus 'for' shell expansion. --- helpers/lh_binary_debian-installer | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 4b36ffa..096ca47 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -254,10 +254,13 @@ if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then mv chroot/binary.deb ./ mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status - for FILE in binary.deb/archives/*.deb - do - Install_file "${FILE}" "binary/pool/main" - done + if ls binary.deb/archives/*.deb > /dev/null 2>&1 + then + for FILE in binary.deb/archives/*.deb + do + Install_file "${FILE}" "binary/pool/main" + done + fi fi # Including base debian packages @@ -273,15 +276,21 @@ else fi # Including local debs -for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb -do - Install_file "${FILE}" "binary/pool/main" -done +if ls ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".udeb > /dev/null 2>&1 +then + for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb + do + Install_file "${FILE}" "binary/pool/main" + done +fi -for FILE in ../config/binary_local-debs/*_all.deb -do - Install_file "${FILE}" "binary/pool/main" -done +if ls ../config/binary_local-debs/*_all.udeb > /dev/null 2>&1 +then + for FILE in ../config/binary_local-debs/*_all.deb + do + Install_file "${FILE}" "binary/pool/main" + done +fi # Generating deb indices mkdir -p binary/dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE} -- cgit v1.0