Simplify default configuration code

12 years ago · 928cd68cf2
parent c3e1cb68d4
commit 928cd68cf2
5 changed files with 11 additions and 38 deletions
--- a/helper/build_config
+++ b/helper/build_config
@ -12,19 +12,10 @@ if [ "${#:-}" -ne 1 ] ; then
  exit 1
 fi

-if [ -z "${CONFIG_POOL:-}" ] ; then
-  echo "Error: $CONFIG_POOL is not set." >&2
-  exit 1
-fi
-
-# support for testsuite
-if [ -z "${FUNCTIONS:-}" ] ; then
-  FUNCTIONS='/usr/share/ngcp-ngcpcfg/functions/'
-fi
-
-if [ -z "${HELPER:-}" ] ; then
-  HELPER='/usr/share/ngcp-ngcpcfg/helper/'
-fi
+# support for testsuite, assume defaults if unset
+CONFIG_POOL="${CONFIG_POOL:-/etc}"
+FUNCTIONS="${FUNCTIONS:-/usr/share/ngcp-ngcpcfg/functions/}"
+HELPER="${HELPER:-/usr/share/ngcp-ngcpcfg/helper/}"

 . ${FUNCTIONS}/main

--- a/sbin/ngcpcfg
+++ b/sbin/ngcpcfg
@ -6,13 +6,8 @@ set -e
 set -u

 # support for testsuite
-if [ -z "${FUNCTIONS:-}" ] ; then
-  FUNCTIONS='/usr/share/ngcp-ngcpcfg/functions/'
-fi
-
-if [ -z "${SCRIPTS:-}" ] ; then
-  SCRIPTS='/usr/share/ngcp-ngcpcfg/scripts/'
-fi
+FUNCTIONS="${FUNCTIONS:-/usr/share/ngcp-ngcpcfg/functions/}"
+SCRIPTS="${SCRIPTS:-/usr/share/ngcp-ngcpcfg/scripts/}"

 if ! [ -r "${FUNCTIONS}/main" ] ; then
  printf "Error: ${FUNCTIONS}/main could not be read. Exiting.\n" >&2
--- a/scripts/build
+++ b/scripts/build
@ -7,13 +7,8 @@ set -e
 set -u

 # support testsuite
-if [ -z "${FUNCTIONS:-}" ] ; then
-  FUNCTIONS='/usr/share/ngcp-ngcpcfg/functions/'
-fi
-
-if [ -z "${HELPER:-}" ] ; then
-  HELPER='/usr/share/ngcp-ngcpcfg/helper/'
-fi
+FUNCTIONS="${FUNCTIONS:-/usr/share/ngcp-ngcpcfg/functions/}"
+HELPER="${HELPER:-/usr/share/ngcp-ngcpcfg/helper/}"

 if ! [ -r ${FUNCTIONS}/main ] ; then
  printf "Error: ${FUNCTIONS}/main could not be read. Exiting.\n" >&2
--- a/scripts/commit
+++ b/scripts/commit
@ -12,10 +12,7 @@ fi

 . /usr/share/ngcp-ngcpcfg/functions/main

-if [ -z "${HELPER:-}" ] ; then
-  HELPER='/usr/share/ngcp-ngcpcfg/helper/'
-fi
-
+HELPER="${HELPER:-/usr/share/ngcp-ngcpcfg/helper/}"
 # main script

 cd "$NGCPCTL_MAIN"
--- a/scripts/encrypt
+++ b/scripts/encrypt
@ -6,13 +6,8 @@ set -e
 set -u

 # support testsuite
-if [ -z "${FUNCTIONS:-}" ] ; then
-  FUNCTIONS='/usr/share/ngcp-ngcpcfg/functions/'
-fi
-
-if [ -z "${HELPER:-}" ] ; then
-  HELPER='/usr/share/ngcp-ngcpcfg/helper/'
-fi
+FUNCTIONS="${FUNCTIONS:-/usr/share/ngcp-ngcpcfg/functions/}"
+HELPER="${HELPER:-/usr/share/ngcp-ngcpcfg/helper/}"

 if ! [ -r ${FUNCTIONS}/main ] ; then
  printf "Error: ${FUNCTIONS}/main could not be read. Exiting.\n" >&2