[SCM] Debian Live build scripts branch, master, updated. 1.0.1-1-58-gbf387fd

[Daniel Baumann]

The following commit has been merged in the master branch:
commit f2909e9efe06d46800d67a7895675dcddb1f52f0
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Oct 29 09:36:29 2008 +0100

    Check for availability of gettext at runtime, and only use it if existing.

diff --git a/debian/control b/debian/control
index dee2995..3c4b8f0 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Vcs-Git: git://git.debian.net/git/debian-live/live-helper.git
 
 Package: live-helper
 Architecture: all
-Depends: debootstrap | cdebootstrap, gettext-base
+Depends: debootstrap | cdebootstrap
+Recommends: gettext-base
 Suggests: dosfstools, genisoimage, memtest86+ | memtest86, mtools, parted, squashfs-tools | genext2fs | mtd-tools, sudo | fakeroot, syslinux | grub, uuid-runtime, win32-loader
 Description: Debian Live build scripts
  live-helper is a set of scripts to build Debian Live system images.
diff --git a/functions/echo.sh b/functions/echo.sh
index 47a89c4..93875ea 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -12,7 +12,12 @@ Echo ()
 	STRING="${1}"
 	shift
 
-	printf "$(eval_gettext "${STRING}")" "${@}"; echo;
+	if [ "${LH_L10N}" = "false" ]
+	then
+		printf "${STRING}\n"
+	else
+		printf "$(eval_gettext "${STRING}")" "${@}"; echo;
+	fi
 }
 
 Echo_debug ()
@@ -22,7 +27,12 @@ Echo_debug ()
 
 	if [ "${LH_DEBUG}" = "enabled" ]
 	then
-		printf "D: $(eval_gettext "${STRING}")" "${@}"; echo;
+		if [ "${LH_L10N}" = "false" ]
+		then
+			printf "D: ${STRING}\n"
+		else
+			printf "D: $(eval_gettext "${STRING}")" "${@}"; echo;
+		fi
 	fi
 }
 
@@ -31,7 +41,12 @@ Echo_error ()
 	STRING="${1}"
 	shift
 
-	(printf "E: $(eval_gettext "${STRING}")" "${@}"; echo;) >&2
+	if [ "${LH_L10N}" = "false" ]
+	then
+		printf "E: ${STRING}\n" >&2
+	else
+		(printf "E: $(eval_gettext "${STRING}")" "${@}"; echo;) >&2
+	fi
 }
 
 Echo_message ()
@@ -41,7 +56,12 @@ Echo_message ()
 
 	if [ "${LH_QUIET}" != "enabled" ]
 	then
-		printf "P: $(eval_gettext "${STRING}")" "${@}"; echo;
+		if [ "${LH_L10N}" = "false" ]
+		then
+			printf "P: ${STRING}\n"
+		else
+			printf "P: $(eval_gettext "${STRING}")" "${@}"; echo;
+		fi
 	fi
 }
 
@@ -52,7 +72,12 @@ Echo_verbose ()
 
 	if [ "${LH_VERBOSE}" = "enabled" ]
 	then
-		printf "I: $(eval_gettext "${STRING}")" "${@}"; echo;
+		if [ "${LH_L10N}" = "false" ]
+		then
+			printf "I: ${STRING}\n"
+		else
+			printf "I: $(eval_gettext "${STRING}")" "${@}"; echo;
+		fi
 	fi
 }
 
@@ -61,7 +86,12 @@ Echo_warning ()
 	STRING="${1}"
 	shift
 
-	printf "W: $(eval_gettext "${STRING}")" "${@}"; echo;
+	if [ "${LH_L10N}" = "false" ]
+	then
+		printf "W: ${STRING}\n"
+	else
+		printf "W: $(eval_gettext "${STRING}")" "${@}"; echo;
+	fi
 }
 
 Echo_breakage ()
diff --git a/functions/l10n.sh b/functions/l10n.sh
index dfb22cb..a1125ec 100755
--- a/functions/l10n.sh
+++ b/functions/l10n.sh
@@ -7,9 +7,18 @@
 # This is free software, and you are welcome to redistribute it
 # under certain conditions; see COPYING for details.
 
-# gettext domain (.mo file name)
-export TEXTDOMAIN=live-helper
-# locale dir for gettext codes
-export TEXTDOMAINDIR=/usr/share/locale
-# load gettext functions
-. gettext.sh
+if [ -x "$(which gettext.sh 2>/dev/null)" ]
+then
+	LH_L10N="enabled"
+
+	# gettext domain (.mo file name)
+	export TEXTDOMAIN="live-helper"
+
+	# locale dir for gettext codes
+	export TEXTDOMAINDIR="/usr/share/locale"
+
+	# load gettext functions
+	. gettext.sh
+else
+	LH_L10N="disabled"
+fi

-- 
Debian Live build scripts