[SCM] debian-live/live-helper branch, master, updated. 1.0_a27-1-54-g52ab1c4

[Daniel Baumann]

The branch, master has been updated
       via  52ab1c4b26719fff822cf72a7388e7abdcd23a07 (commit)
       via  4be7194a1802317d2ee2ed5c2ecc2df5431af9a6 (commit)
      from  a03cfd36b80e6a37234440bfcf9ba2d3e33811b7 (commit)


- Shortlog ------------------------------------------------------------
52ab1c4 syslinux: defaults to english text if we lack the specified language
4be7194 refactoring: simplified if/else case since the list of supported arch were too long

Summary of changes:
 helpers/lh_binary_syslinux |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 52ab1c4b26719fff822cf72a7388e7abdcd23a07
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Mon Sep 24 18:17:48 2007 -0300

    syslinux: defaults to english text if we lack the specified language

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 77ccc70..b2ad8ae 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -364,7 +364,12 @@ case "${LH_BINARY_IMAGES}" in
 		esac
 
 		cp -r "${TEMPLATES}"/common/* binary/isolinux
-		cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* binary/isolinux
+		if [ -d "${TEMPLATES}"/"${LH_LANGUAGE}" ]
+		then
+			cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* binary/isolinux
+		else
+			cp -r "${TEMPLATES}"/en/* binary/isolinux
+		fi
 
 		for FILE in binary/isolinux/*.live
 		do

commit 4be7194a1802317d2ee2ed5c2ecc2df5431af9a6
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Mon Sep 24 18:11:13 2007 -0300

    refactoring: simplified if/else case since the list of supported arch were too long

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index b845237..77ccc70 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -378,15 +378,18 @@ case "${LH_BINARY_IMAGES}" in
 				mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install)
 			done
 
-			if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
-			then
-				for FILE in binary/isolinux/*.install.g-i
-				do
-					mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install.g-i)
-				done
-			else
-				rm -f binary/isolinux/*.install.g-i
-			fi
+			case "${LH_ARCHITECTURE}" in
+				amd64|i386|powerpc)
+					for FILE in binary/isolinux/*.install.g-i
+					do
+						mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install.g-i)
+					done
+					;;
+
+				*)
+					rm -f binary/isolinux/*.install.g-i
+					;;
+			esac
 		else
 			rm -f binary/isolinux/*.install*
 		fi

-- 
debian-live/live-helper