Generalizing internal LH_QUIET variable.

functions/arguments.sh

@@ -48,7 +48,7 @@ Arguments ()
 				;;
 
 			--quiet)
-				LH_QUIET="enabled"
+				_QUIET="enabled"
 				shift
 				;;
 

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

functions/echo.sh

@@ -54,7 +54,7 @@ Echo_message ()
 	STRING="${1}"
 	shift
 
-	if [ "${LH_QUIET}" != "enabled" ]
+	if [ "${_QUIET}" != "enabled" ]
 	then
 		if [ "${_L10N}" = "false" ]
 		then

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

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

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

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

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})

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