From 487d8eb287ae0186f7067f30201ba167746e44bf Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Fri, 13 Dec 2019 14:58:57 +0100
Subject: [PATCH] refer to user variable, not internal variable in error
 message

---
 travis/prepare.sh | 2 --
 travis/utils.sh   | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/travis/prepare.sh b/travis/prepare.sh
index e0d81b9..b804c1f 100755
--- a/travis/prepare.sh
+++ b/travis/prepare.sh
@@ -7,8 +7,6 @@ set -e
 # Perl version of "readlink -f" (which MacOS does not provide)
 readlinkf() { perl -MCwd -e 'print Cwd::abs_path shift' "$1"; }
 
-SETUP_DIRS=$(echo $SETUP_PATH | tr ":" "\n")
-
 SCRIPTDIR=$(dirname $(readlinkf $0))
 CURDIR="$PWD"
 CACHEDIR="$HOME/.cache"
diff --git a/travis/utils.sh b/travis/utils.sh
index ce1bbd9..cb00f8c 100644
--- a/travis/utils.sh
+++ b/travis/utils.sh
@@ -36,15 +36,15 @@ die() {
 
 # source_set(settings)
 #
-# Source a settings file (extension .set) found in the SETUP_DIRS path
+# Source a settings file (extension .set) found in SETUP_PATH
 # May be called recursively (from within a settings file)
 declare -a SEEN_SETUPS
 source_set() {
   local set_file=${1//[$'\r']}
   local set_dir
   local found=0
-  [ "${SETUP_DIRS}" ] || die "Search path for setup files (SETUP_PATH) is empty"
-  for set_dir in ${SETUP_DIRS}
+  [ "${SETUP_PATH}" ] || die "Search path for setup files (SETUP_PATH) is empty"
+  for set_dir in $(echo $SETUP_PATH | tr ":" "\n")
   do
     if [ -e $set_dir/$set_file.set ]
     then
@@ -76,7 +76,7 @@ source_set() {
       break
     fi
   done
-  [ $found -ne 0 ] || die "Setup file $set_file.set does not exist in SETUP_DIRS search path ($SETUP_DIRS)"
+  [ $found -ne 0 ] || die "Setup file $set_file.set does not exist in SETUP_PATH search path ($SETUP_PATH)"
 }
 
 # update_release_local(varname, place)