From cb0894b3b3d13da593a36cd45d5e0383adfd78f8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 1 Nov 2008 14:59:51 +0100
Subject: Generalizing internal LH_QUIET variable.

---
 functions/arguments.sh             |  2 +-
 functions/defaults.sh              |  2 +-
 functions/echo.sh                  |  2 +-
 helpers/lh_binary_debian-installer |  2 +-
 helpers/lh_binary_iso              |  2 +-
 helpers/lh_binary_rootfs           |  2 +-
 helpers/lh_bootstrap_cdebootstrap  |  2 +-
 helpers/lh_config                  | 13 ++++---------
 helpers/lh_source_iso              |  2 +-
 9 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/functions/arguments.sh b/functions/arguments.sh
index 80851d3..877e0d0 100755
--- a/functions/arguments.sh
+++ b/functions/arguments.sh
@@ -48,7 +48,7 @@ Arguments ()
 				;;
 
 			--quiet)
-				LH_QUIET="enabled"
+				_QUIET="enabled"
 				shift
 				;;
 
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 97917ad..e6d71a5 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -223,7 +223,7 @@ Set_defaults ()
 	LH_BREAKPOINTS="${LH_BREAKPOINTS:-disabled}"
 	_DEBUG="${_DEBUG:-disabled}"
 	_FORCE="${_FORCE:-disabled}"
-	LH_QUIET="${LH_QUIET:-disabled}"
+	_QUIET="${_QUIET:-disabled}"
 	LH_VERBOSE="${LH_VERBOSE:-disabled}"
 
 	## config/bootstrap
diff --git a/functions/echo.sh b/functions/echo.sh
index d9a699d..56eb344 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -54,7 +54,7 @@ Echo_message ()
 	STRING="${1}"
 	shift
 
-	if [ "${LH_QUIET}" != "enabled" ]
+	if [ "${_QUIET}" != "enabled" ]
 	then
 		if [ "${_L10N}" = "false" ]
 		then
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index cac39c6..8d69063 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -31,7 +31,7 @@ Set_defaults
 if [ "${_DEBUG}" = "enabled" ]
 then
 	WGET_OPTIONS="${WGET_OPTIONS} --verbose"
-elif [ "${LH_QUIET}" = "enabled" ]
+elif [ "${_QUIET}" = "enabled" ]
 then
 	WGET_OPTIONS="${WGET_OPTIONS} --quiet"
 else
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 7842d30..549692b 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -66,7 +66,7 @@ fi
 GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot"
 
 # Handle genisoimage live-helper specific options
-if [ "${LH_QUIET}" = "enabled" ]
+if [ "${_QUIET}" = "enabled" ]
 then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
 fi
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index d6ab957..5529a02 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -244,7 +244,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 		# Remove stale squashfs image
 		rm -f chroot/filesystem.squashfs
 
-		if [ "${LH_QUIET}" = "enabled" ] && [ "${LH_DISTRIBUTION}" != "etch" ]
+		if [ "${_QUIET}" = "enabled" ] && [ "${LH_DISTRIBUTION}" != "etch" ]
 		then
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
 		fi
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index c2ab3f3..06a18fa 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -109,7 +109,7 @@ then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
 fi
 
-if [ "${LH_QUIET}" = "enabled" ]
+if [ "${_QUIET}" = "enabled" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
 fi
diff --git a/helpers/lh_config b/helpers/lh_config
index 31f9834..6cc9b58 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -322,11 +322,6 @@ Local_arguments ()
 				shift
 				;;
 
-			--quiet)
-				LH_QUIET="enabled"
-				shift
-				;;
-
 			--verbose)
 				LH_VERBOSE="enabled"
 				shift
@@ -682,7 +677,7 @@ Local_arguments ()
 				;;
 
 			--quiet)
-				LH_QUIET="enabled"
+				_QUIET="enabled"
 				shift
 				;;
 
@@ -856,9 +851,9 @@ LH_TEMPLATES="${LH_TEMPLATES}"
 # (Default: ${_FORCE})
 #_FORCE="${_FORCE}"
 
-# \$LH_QUIET: enable quiet
-# (Default: ${LH_QUIET})
-LH_QUIET="${LH_QUIET}"
+# \$_QUIET: enable quiet
+# (Default: ${_QUIET})
+_QUIET="${_QUIET}"
 
 # \$LH_VERBOSE: enable verbose
 # (Default: ${LH_VERBOSE})
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index 585e812..bd8ffd8 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -64,7 +64,7 @@ then
 	rm -f source.iso
 fi
 
-if [ "${LH_QUIET}" = "enabled" ]
+if [ "${_QUIET}" = "enabled" ]
 then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
 fi
-- 
cgit v1.0