[SCM] live-helper branch, debian, updated. debian/2.0_a1-1-9-gf7c2348

Daniel Baumann daniel at debian.org
Sat Nov 21 09:18:50 UTC 2009


The following commit has been merged in the debian branch:
commit f7c2348a97a531b7900086bd2bac4d418d8b157a
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Nov 21 10:16:58 2009 +0100

    Setting LH_BASE variable in defaults.sh globally.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 1023805..3179df0 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -11,6 +11,8 @@ Set_defaults ()
 {
 	## config/common
 
+	LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
 	# Setting mode
 	if [ -z "${LH_MODE}" ]
 	then
@@ -217,13 +219,13 @@ Set_defaults ()
 	# Setting includes
 	if [ -z "${LH_INCLUDES}" ]
 	then
-		LH_INCLUDES="${LH_BASE:-/usr/share/live-helper}/includes"
+		LH_INCLUDES="${LH_BASE}/includes"
 	fi
 
 	# Setting templates
 	if [ -z "${LH_TEMPLATES}" ]
 	then
-		LH_TEMPLATES="${LH_BASE:-/usr/share/live-helper}/templates"
+		LH_TEMPLATES="${LH_BASE}/templates"
 	fi
 
 	# Setting live helper options

-- 
live-helper



More information about the debian-live-changes mailing list