[SCM] Debian Live build scripts branch, master, updated. 1.0.3-2-27-g6308333
Daniel Baumann
daniel at debian.org
Thu Mar 12 18:31:27 UTC 2009
The following commit has been merged in the master branch:
commit 630833377a51a51e359693efcecbed3d1727f410
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Mar 12 19:26:10 2009 +0100
Only trying to handle syslinux help screens if they are actually available.
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 42eb1d5..94fae10 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -201,24 +201,33 @@ Copy_syslinux_templates ()
fi
fi
- for FILE in ${SCREEN_PATH}/*.live
- do
- mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .live)
- done
-
- if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+ if ls ${SCREEN_PATH}/*.live > /dev/null 2>&1
then
- for FILE in ${SCREEN_PATH}/*.install
+ for FILE in ${SCREEN_PATH}/*.live
do
- mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install)
+ mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .live)
done
+ fi
+
+ if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+ then
+ if ls ${SCREEN_PATH}/*.install > /dev/null 2>&1
+ then
+ for FILE in ${SCREEN_PATH}/*.install
+ do
+ mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install)
+ done
+ fi
case "${LH_ARCHITECTURE}" in
amd64|i386|powerpc)
- for FILE in ${SCREEN_PATH}/*.install.g-i
- do
- mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install.g-i)
- done
+ if ls ${SCREEN_PATH}/*.install.g-i > /dev/null 2>&1
+ then
+ for FILE in ${SCREEN_PATH}/*.install.g-i
+ do
+ mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install.g-i)
+ done
+ fi
;;
*)
--
Debian Live build scripts
More information about the debian-live-changes
mailing list