Move back isset to the functions-common
isset function was moved to config file related functions by accident,
this change also simplfies the isset in a bash >=4.2 way.
All supported distro has at least bash 4.2. (RHEL6 used 4.1)
Change-Id: Id644b46ff9cdbe18cde46e96aa72764e1c8653ac
diff --git a/functions-common b/functions-common
index 48e400d..56fa64a 100644
--- a/functions-common
+++ b/functions-common
@@ -62,6 +62,9 @@
$xtrace
}
+function isset {
+ [[ -v "$1" ]]
+}
# Control Functions
# =================
diff --git a/inc/ini-config b/inc/ini-config
index 0d6d169..26401f3 100644
--- a/inc/ini-config
+++ b/inc/ini-config
@@ -205,16 +205,6 @@
$xtrace
}
-function isset {
- nounset=$(set +o | grep nounset)
- set +o nounset
- [[ -n "${!1+x}" ]]
- result=$?
- $nounset
- return $result
-}
-
-
# Restore xtrace
$INC_CONF_TRACE
diff --git a/tests/functions.sh b/tests/functions.sh
index 874d022..126080f 100755
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -196,3 +196,20 @@
echo "is_package_installed() on deleted package failed"
fi
fi
+
+# test isset function
+echo "Testing isset()"
+you_should_not_have_this_variable=42
+
+if isset "you_should_not_have_this_variable"; then
+ echo "OK"
+else
+ echo "\"you_should_not_have_this_variable\" not declared. failed"
+fi
+
+unset you_should_not_have_this_variable
+if isset "you_should_not_have_this_variable"; then
+ echo "\"you_should_not_have_this_variable\" looks like declared variable. failed"
+else
+ echo "OK"
+fi