diff options
| author | Antonio Terceiro <terceiro@softwarelivre.org> | 2008-08-08 22:20:56 -0300 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:37 +0100 |
| commit | 7f1a4e4fc50c636d187472388924109e853ec69e (patch) | |
| tree | f07000b79efde785760d3cd4247209b0ba483401 /helpers/lh_binary_debian-installer | |
| parent | 382d244050abbfb9f9e52ec9383d333b158ded5d (diff) | |
| download | live-build-7f1a4e4fc50c636d187472388924109e853ec69e.zip live-build-7f1a4e4fc50c636d187472388924109e853ec69e.tar.gz | |
Replacing file checking with ls by function calls
Instead of repeatedly doing "ls ... > /dev/null 2>&1", just use a
function that does exactly that.
Diffstat (limited to 'helpers/lh_binary_debian-installer')
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index e579eec..5121596 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -400,7 +400,7 @@ then mv chroot/binary.deb ./ mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status - if ls binary.deb/archives/*.deb > /dev/null 2>&1 + if Find_files binary.deb/archives/*.deb then for FILE in binary.deb/archives/*.deb do @@ -424,7 +424,7 @@ then fi # Including local debs - if ls ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb > /dev/null 2>&1 + if Find_files ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb then for FILE in ../config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb do @@ -432,7 +432,7 @@ then done fi - if ls ../config/binary_local-debs/*_all.deb > /dev/null 2>&1 + if Find_files ../config/binary_local-debs/*_all.deb then for FILE in ../config/binary_local-debs/*_all.deb do @@ -480,7 +480,7 @@ then cp *.udeb ../cache/packages_debian-installer.udeb # Including local udebs - if ls ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb > /dev/null 2>&1 + if Find_files ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb then for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb do @@ -491,7 +491,7 @@ then done fi - if ls ../config/binary_local-udebs/*_all.udeb > /dev/null 2>&1 + if Find_files ../config/binary_local-udebs/*_all.udeb then for FILE in ../config/binary_local-udebs/*_all.udeb do @@ -580,7 +580,7 @@ then fi # Including preseeding files - if ls config/binary_debian_installer/preseed*.cfg > /dev/null 2>&1 + if Find_files config/binary_debian_installer/preseed*.cfg then cp config/binary_debian-installer/preseed*.cfg binary/install fi |