From b0e6586805a456fe8430abc2b5eb4601b7e0eed2 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 15 Jan 2019 14:02:05 +0100
Subject: lib/load-configuration: do "set +e" if run from bash and base_dir
 already set, too

---
 lib/load-configuration | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'lib/load-configuration')

diff --git a/lib/load-configuration b/lib/load-configuration
index 01f922d..b4f0474 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -22,16 +22,18 @@ else
   i_am_the_master=false
 fi
 
-if [ -z "${base_dir}" ]; then
-  # dirty hack to get this stuff debugable from a bash
-  if [ "x${0##*/}" = "x-bash" ] || [ "x${0##*/}" = "xbash" ] || [ "x${0##*/}" = "xdash" ]; then
+# dirty hack to get this stuff debugable from a bash
+if [ "x${0##*/}" = "x-bash" ] || [ "x${0##*/}" = "xbash" ] || [ "x${0##*/}" = "xdash" ]; then
+  set +e
+  if [ -z "${base_dir}" ]; then
     base_dir=$(pwd)
-    set +e
-  else
-    base_dir=$(printf '%s/..' "$(dirname "$(readlink -f "$0")")")
   fi
 fi
 
+if [ -z "${base_dir}" ]; then
+  base_dir=$(printf '%s/..' "$(dirname "$(readlink -f "$0")")")
+fi
+
 work_dir="${base_dir}/work"
 
 # shellcheck source=../lib/common-functions
-- 
cgit v1.2.3