diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-01-15 19:47:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:35:43 +0100 |
| commit | e0ad8863933ed0723aaf7f6f89011eaa3827263c (patch) | |
| tree | c3e8237972aac2461b531fa86431a061efd5a0fa | |
| parent | 2ebe770e4175a3cedd8fec12a0594d1e7bb7684b (diff) | |
| download | live-build-e0ad8863933ed0723aaf7f6f89011eaa3827263c.zip live-build-e0ad8863933ed0723aaf7f6f89011eaa3827263c.tar.gz | |
Re-add guards against bogus 'for' shell expansion.
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 33 |
1 files 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} |