From 02057e68dcbdbc057dbe4dd53f6ec8899a398071 Mon Sep 17 00:00:00 2001 From: Mafoo Date: Fri, 30 Sep 2016 23:59:58 +0100 Subject: [PATCH] BugFix-Resource sourcing (#46) changes of directory using relative paths is back firing --- debian/install.sh | 3 ++- debian/resources/arguments.sh | 2 -- debian/resources/fusionpbx.sh | 1 + debian/resources/switch/package-release.sh | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/install.sh b/debian/install.sh index abab579..e8b1f53 100755 --- a/debian/install.sh +++ b/debian/install.sh @@ -3,7 +3,8 @@ #move to script directory so all relative paths work cd "$(dirname "$0")" -. resources/arguments.sh +. ./resources/colors.sh +. ./resources/arguments.sh if [ $CPU_CHECK = true ] && [ $USE_SWITCH_SOURCE = false ]; then #check what the CPU and OS are diff --git a/debian/resources/arguments.sh b/debian/resources/arguments.sh index 4caeb95..ac8333e 100755 --- a/debian/resources/arguments.sh +++ b/debian/resources/arguments.sh @@ -1,7 +1,5 @@ #!/bin/sh -. ./colors.sh - #Process command line options only if we haven't been processed once if [ -z "$CPU_CHECK" ]; then export script_name=`basename "$0"` diff --git a/debian/resources/fusionpbx.sh b/debian/resources/fusionpbx.sh index df731ff..46c7bd1 100755 --- a/debian/resources/fusionpbx.sh +++ b/debian/resources/fusionpbx.sh @@ -3,6 +3,7 @@ #move to script directory so all relative paths work cd "$(dirname "$0")" +. ./colors.sh . ./arguments.sh #send a message diff --git a/debian/resources/switch/package-release.sh b/debian/resources/switch/package-release.sh index 18bd3b0..11861e8 100755 --- a/debian/resources/switch/package-release.sh +++ b/debian/resources/switch/package-release.sh @@ -3,7 +3,8 @@ #move to script directory so all relative paths work cd "$(dirname "$0")" -. ./arguments.sh +. ../colors.sh +. ../arguments.sh apt-get update && apt-get install -y --force-yes curl memcached haveged arch=$(uname -m)