diff options
author | Daniel Baumann <daniel@debian.org> | 2008-11-01 14:57:17 +0100 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:43 +0100 |
commit | 3ff1c8050b9e32837fcaad6fbc4e9981f9cbdffd (patch) | |
tree | 91f2b97d1a78d65fa052c1a051c541f8b1ccd877 | |
parent | 137f573c859d7b60192fbee65a418cf6c75acca2 (diff) | |
download | live-build-3ff1c8050b9e32837fcaad6fbc4e9981f9cbdffd.zip live-build-3ff1c8050b9e32837fcaad6fbc4e9981f9cbdffd.tar.gz |
Generalizing internal LH_DEBUG variable.
-rwxr-xr-x | functions/arguments.sh | 2 | ||||
-rwxr-xr-x | functions/defaults.sh | 2 | ||||
-rwxr-xr-x | functions/echo.sh | 2 | ||||
-rwxr-xr-x | functions/exit.sh | 2 | ||||
-rwxr-xr-x | helpers/lh_binary_debian-installer | 2 | ||||
-rwxr-xr-x | helpers/lh_bootstrap_cdebootstrap | 2 | ||||
-rwxr-xr-x | helpers/lh_config | 13 |
7 files changed, 10 insertions, 15 deletions
diff --git a/functions/arguments.sh b/functions/arguments.sh index 6c967d9..80851d3 100755 --- a/functions/arguments.sh +++ b/functions/arguments.sh @@ -33,7 +33,7 @@ Arguments () ;; --debug) - LH_DEBUG="enabled" + _DEBUG="enabled" shift ;; diff --git a/functions/defaults.sh b/functions/defaults.sh index e8e9f36..97917ad 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -221,7 +221,7 @@ Set_defaults () # Setting live helper options LH_BREAKPOINTS="${LH_BREAKPOINTS:-disabled}" - LH_DEBUG="${LH_DEBUG:-disabled}" + _DEBUG="${_DEBUG:-disabled}" _FORCE="${_FORCE:-disabled}" LH_QUIET="${LH_QUIET:-disabled}" LH_VERBOSE="${LH_VERBOSE:-disabled}" diff --git a/functions/echo.sh b/functions/echo.sh index 034aab4..d9a699d 100755 --- a/functions/echo.sh +++ b/functions/echo.sh @@ -25,7 +25,7 @@ Echo_debug () STRING="${1}" shift - if [ "${LH_DEBUG}" = "enabled" ] + if [ "${_DEBUG}" = "enabled" ] then if [ "${_L10N}" = "false" ] then diff --git a/functions/exit.sh b/functions/exit.sh index e7e7b11..18bc1eb 100755 --- a/functions/exit.sh +++ b/functions/exit.sh @@ -9,7 +9,7 @@ Exit () { - if [ "${LH_DEBUG}" = "enabled" ] + if [ "${_DEBUG}" = "enabled" ] then # Dump variables set | grep -e ^LH diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 3ab6252..cac39c6 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -28,7 +28,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_DEBUG}" = "enabled" ] +if [ "${_DEBUG}" = "enabled" ] then WGET_OPTIONS="${WGET_OPTIONS} --verbose" elif [ "${LH_QUIET}" = "enabled" ] diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 7b260b1..c2ab3f3 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -104,7 +104,7 @@ else esac fi -if [ "${LH_DEBUG}" = "enabled" ] +if [ "${_DEBUG}" = "enabled" ] then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug" fi diff --git a/helpers/lh_config b/helpers/lh_config index 492622b..31f9834 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -322,11 +322,6 @@ Local_arguments () shift ;; - --debug) - LH_DEBUG="enabled" - shift - ;; - --quiet) LH_QUIET="enabled" shift @@ -668,7 +663,7 @@ Local_arguments () ;; --debug) - LH_DEBUG="enabled" + _DEBUG="enabled" shift ;; @@ -853,9 +848,9 @@ LH_TEMPLATES="${LH_TEMPLATES}" # (Default: ${LH_BREAKPOINTS}) #LH_BREAKPOINTS="${LH_BREAKPOINTS}" -# \$LH_DEBUG: enable debug -# (Default: ${LH_DEBUG}) -#LH_DEBUG="${LH_DEBUG}" +# \$_DEBUG: enable debug +# (Default: ${_DEBUG}) +#_DEBUG="${_DEBUG}" # \$_FORCE: enable force # (Default: ${_FORCE}) |