From ad6b01b388767f2efd39e4b4f10974461fc5220d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 1 Nov 2008 15:01:33 +0100
Subject: Generalizing internal LH_VERBOSE variable.

---
 functions/arguments.sh            |  2 +-
 functions/defaults.sh             |  2 +-
 functions/echo.sh                 |  2 +-
 helpers/lh_binary_iso             |  2 +-
 helpers/lh_binary_rootfs          |  2 +-
 helpers/lh_bootstrap_cdebootstrap |  2 +-
 helpers/lh_bootstrap_debootstrap  |  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 877e0d0..3d0d869 100755
--- a/functions/arguments.sh
+++ b/functions/arguments.sh
@@ -58,7 +58,7 @@ Arguments ()
 				;;
 
 			--verbose)
-				LH_VERBOSE="enabled"
+				_VERBOSE="enabled"
 				shift
 				;;
 
diff --git a/functions/defaults.sh b/functions/defaults.sh
index e6d71a5..281bed4 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -224,7 +224,7 @@ Set_defaults ()
 	_DEBUG="${_DEBUG:-disabled}"
 	_FORCE="${_FORCE:-disabled}"
 	_QUIET="${_QUIET:-disabled}"
-	LH_VERBOSE="${LH_VERBOSE:-disabled}"
+	_VERBOSE="${_VERBOSE:-disabled}"
 
 	## config/bootstrap
 
diff --git a/functions/echo.sh b/functions/echo.sh
index 56eb344..8162212 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -70,7 +70,7 @@ Echo_verbose ()
 	STRING="${1}"
 	shift
 
-	if [ "${LH_VERBOSE}" = "enabled" ]
+	if [ "${_VERBOSE}" = "enabled" ]
 	then
 		if [ "${_L10N}" = "false" ]
 		then
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 549692b..071535a 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -71,7 +71,7 @@ then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
 fi
 
-if [ "${LH_VERBOSE}" = "enabled" ]
+if [ "${_VERBOSE}" = "enabled" ]
 then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
 fi
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 5529a02..4edac40 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -249,7 +249,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
 		fi
 
-		if [ "${LH_VERBOSE}" = "enabled" ]
+		if [ "${_VERBOSE}" = "enabled" ]
 		then
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
 		fi
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 06a18fa..1e0090f 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -114,7 +114,7 @@ then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
 fi
 
-if [ "${LH_VERBOSE}" = "enabled" ]
+if [ "${_VERBOSE}" = "enabled" ]
 then
 	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
 fi
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index ae33f5e..bb199df 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -104,7 +104,7 @@ else
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot"
 fi
 
-if [ "${LH_VERBOSE}" = "true" ]
+if [ "${_VERBOSE}" = "true" ]
 then
 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"
 fi
diff --git a/helpers/lh_config b/helpers/lh_config
index 6cc9b58..480f3f3 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -322,11 +322,6 @@ Local_arguments ()
 				shift
 				;;
 
-			--verbose)
-				LH_VERBOSE="enabled"
-				shift
-				;;
-
 			-v|--version)
 				Version
 				shift
@@ -687,7 +682,7 @@ Local_arguments ()
 				;;
 
 			--verbose)
-				LH_VERBOSE="enabled"
+				_VERBOSE="enabled"
 				shift
 				;;
 
@@ -855,9 +850,9 @@ LH_TEMPLATES="${LH_TEMPLATES}"
 # (Default: ${_QUIET})
 _QUIET="${_QUIET}"
 
-# \$LH_VERBOSE: enable verbose
-# (Default: ${LH_VERBOSE})
-#LH_VERBOSE="${LH_VERBOSE}"
+# \$_VERBOSE: enable verbose
+# (Default: ${_VERBOSE})
+#_VERBOSE="${_VERBOSE}"
 
 # Internal stuff (FIXME)
 APT_OPTIONS="${APT_OPTIONS}"
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index bd8ffd8..d246290 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -69,7 +69,7 @@ then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
 fi
 
-if [ "${LH_VERBOSE}" = "enabled" ]
+if [ "${_VERBOSE}" = "enabled" ]
 then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
 fi
-- 
cgit v1.0