diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-01-15 02:44:41 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:35:36 +0100 |
| commit | 28d856f6f17168a56576b1f35bc8136109d062ce (patch) | |
| tree | bd0460c577b0fa404574ada40aa37c91d9021a2f | |
| parent | 295542614d7e44854df47e17c348e5f1f4187d58 (diff) | |
| download | live-build-28d856f6f17168a56576b1f35bc8136109d062ce.zip live-build-28d856f6f17168a56576b1f35bc8136109d062ce.tar.gz | |
Remove conditionals, as an expansion never 'fails': it just
won't copy any files.
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 81d535f..6b48139 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -254,13 +254,10 @@ if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status fi -if ls binary.deb/archives/*.deb > /dev/null 2>&1 -then - for FILE in binary.deb/archives/*.deb - do - Install_file "${FILE}" - done -fi +for FILE in binary.deb/archives/*.deb +do + Install_file "${FILE}" +done # Including base debian packages if [ -d cache/packages_bootstrap ] @@ -275,21 +272,15 @@ else fi # Including local debs -if ls ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb > /dev/null 2>&1 -then - for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb - do - Install_file "${FILE}" - done -fi +for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb +do + Install_file "${FILE}" +done -if ls ../config/binary_local-debs/*_all.deb > /dev/null 2>&1 -then - for FILE in ../config/binary_local-debs/*_all.deb - do - Install_file "${FILE}" - done -fi +for FILE in ../config/binary_local-debs/*_all.deb +do + Install_file "${FILE}" +done # Generating deb indices mkdir -p binary/dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE} |