From 85c342c299231131d22764c0dfdcf977c57ce147 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:05:11 +0200
Subject: Adding live-helper 1.0~a13-1.

---
 helpers/lh_chroot_localization | 49 +++++++++++-------------------------------
 1 file changed, 13 insertions(+), 36 deletions(-)

(limited to 'helpers/lh_chroot_localization')

diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization
index 914be81f1..1741b589a 100755
--- a/helpers/lh_chroot_localization
+++ b/helpers/lh_chroot_localization
@@ -9,21 +9,21 @@
 
 set -e
 
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
 do
-	. ${FUNCTION}
+	. "${FUNCTION}"
 done
 
-# Set static variables
+# Setting static variables
 DESCRIPTION="install localization packages into chroot"
 HELP=""
 USAGE="${PROGRAM} [--force]"
 
 Arguments "${@}"
 
-Echo_debug "Init ${PROGRAM}"
-
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/bootstrap
@@ -32,7 +32,7 @@ Read_conffile config/binary
 Read_conffile config/source
 Set_defaults
 
-Breakpoint "chroot_localization: Init"
+Echo_message "Begin installing localization packages..."
 
 # Requiring stage file
 Require_stagefile .stage/bootstrap
@@ -601,35 +601,12 @@ then
 	esac
 
 	# Setting languages
-	if [ -z "${ICEAPE}" ]
-	then
-		ICEAPE="${LIVE_LANGUAGE}"
-	fi
-
-	if [ -z "${ICEDOCE}" ]
-	then
-		ICEDOVE="${LIVE_LANGUAGE}"
-	fi
-
-	if [ -z "${ICEWEASEL}" ]
-	then
-		ICEWEASEL="${LIVE_LANGUAGE}"
-	fi
-
-	if [ -z "${KDE}" ]
-	then
-		KDE="${LIVE_LANGUAGE}"
-	fi
-
-	if [ -z "${KOFFICE}" ]
-	then
-		KOFFICE="${LIVE_LANGUAGE}"
-	fi
-
-	if [ -z "${OPENOFFICE}" ]
-	then
-		OPENOFFICE="${LIVE_LANGUAGE}"
-	fi
+	ICEAPE="${ICEAPE:-$LIVE_LANGUAGE}"
+	ICEDOVE="${ICEDOVE:-$LIVE_LANGUAGE}"
+	ICEWEASEL="${ICEWEASEL:-$LIVE_LANGUAGE}"
+	KDE="${KDE:-$LIVE_LANGUAGE}"
+	KOFFICE="${KOFFICE:-$LIVE_LANGUAGE}"
+	OPENOFFICE="${OPENOFFICE:-$LIVE_LANGUAGE}"
 
 	# Setting packages
 	for LOCALIZATION in ${LOCALIZATIONS}
-- 
cgit v1.2.3