[SCM] Debian Live build scripts branch, master, updated. 1.0.3-2-28-g93a931c

Daniel Baumann daniel at debian.org
Sun Mar 15 06:30:29 UTC 2009


The following commit has been merged in the master branch:
commit 93a931c8205dc91b722dac968416732c7ffec293
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Mar 15 07:25:06 2009 +0100

    Improving check for syslinux templates by checking actual content, not just the directory.

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 94fae10..310b879 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -191,11 +191,11 @@ Copy_syslinux_templates ()
 		esac
 	fi
 
-	if [ -d "${TEMPLATES}"/"${LH_LANGUAGE}" ]
+	if ls "${TEMPLATES}/${LH_LANGUAGE}"/* > /dev/null 2>&1
 	then
 		cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* ${SCREEN_PATH}
 	else
-		if [ -d "${TEMPLATES}"/en/* ]
+		if ls "${TEMPLATES}"/en/* > /dev/null 2>&1
 		then
 			cp -r "${TEMPLATES}"/en/* ${SCREEN_PATH}
 		fi

-- 
Debian Live build scripts



More information about the debian-live-changes mailing list