From 5d17a36b6d5fd04d4b9ed555fdb39c0d1c8f3609 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 23 Nov 2018 08:27:46 +0100
Subject: lib/load-configuration: do not set base_dir if it is already set

---
 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 cf7575b..01f922d 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -22,12 +22,14 @@ else
   i_am_the_master=false
 fi
 
-# dirty hack to get this stuff debugable from a bash
-if [ "x${0##*/}" = "x-bash" ] || [ "x${0##*/}" = "xbash" ] || [ "x${0##*/}" = "xdash" ]; then
-  base_dir=$(pwd)
-  set +e
-else
-  base_dir=$(printf '%s/..' "$(dirname "$(readlink -f "$0")")")
+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
+    base_dir=$(pwd)
+    set +e
+  else
+    base_dir=$(printf '%s/..' "$(dirname "$(readlink -f "$0")")")
+  fi
 fi
 
 work_dir="${base_dir}/work"
-- 
cgit v1.2.3