From 137f573c859d7b60192fbee65a418cf6c75acca2 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 1 Nov 2008 14:55:27 +0100
Subject: Generalizing internal LH_FORCE variable.
---
functions/arguments.sh | 2 +-
functions/defaults.sh | 2 +-
functions/stagefile.sh | 2 +-
helpers/lh_config | 13 ++++---------
4 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/functions/arguments.sh b/functions/arguments.sh
index 4c476d2..6c967d9 100755
--- a/functions/arguments.sh
+++ b/functions/arguments.sh
@@ -38,7 +38,7 @@ Arguments ()
;;
--force)
- LH_FORCE="enabled"
+ _FORCE="enabled"
shift
;;
diff --git a/functions/defaults.sh b/functions/defaults.sh
index bc4e839..e8e9f36 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -222,7 +222,7 @@ Set_defaults ()
# Setting live helper options
LH_BREAKPOINTS="${LH_BREAKPOINTS:-disabled}"
LH_DEBUG="${LH_DEBUG:-disabled}"
- LH_FORCE="${LH_FORCE:-disabled}"
+ _FORCE="${_FORCE:-disabled}"
LH_QUIET="${LH_QUIET:-disabled}"
LH_VERBOSE="${LH_VERBOSE:-disabled}"
diff --git a/functions/stagefile.sh b/functions/stagefile.sh
index e116a78..2164269 100755
--- a/functions/stagefile.sh
+++ b/functions/stagefile.sh
@@ -15,7 +15,7 @@ Check_stagefile ()
# Checking stage file
if [ -f "${FILE}" ]
then
- if [ "${LH_FORCE}" != "enabled" ]
+ if [ "${_FORCE}" != "enabled" ]
then
# Skipping execution
Echo_warning "skipping %s" "${NAME}"
diff --git a/helpers/lh_config b/helpers/lh_config
index 513a2dc..492622b 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -327,11 +327,6 @@ Local_arguments ()
shift
;;
- --force)
- LH_FORCE="enabled"
- shift
- ;;
-
--quiet)
LH_QUIET="enabled"
shift
@@ -678,7 +673,7 @@ Local_arguments ()
;;
--force)
- LH_FORCE="enabled"
+ _FORCE="enabled"
shift
;;
@@ -862,9 +857,9 @@ LH_TEMPLATES="${LH_TEMPLATES}"
# (Default: ${LH_DEBUG})
#LH_DEBUG="${LH_DEBUG}"
-# \$LH_FORCE: enable force
-# (Default: ${LH_FORCE})
-#LH_FORCE="${LH_FORCE}"
+# \$_FORCE: enable force
+# (Default: ${_FORCE})
+#_FORCE="${_FORCE}"
# \$LH_QUIET: enable quiet
# (Default: ${LH_QUIET})
--
cgit v1.0