manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove conditionals, as an expansion never 'fails': it just 

won't copy any files.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
This commit is contained in:
Chris Lamb 2008-01-15 02:44:41 +00:00
parent 13e554b150
commit 5b396d4fe7
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
helpers/lh_binary_debian-installer
View File

@ -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}