From e2ebab8ff267604c65157e6a7c9765541bdf8adb Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 21 Sep 2015 23:34:50 -0300 Subject: Even more provision config locations --- share/hydractl/provision | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/hydractl/provision b/share/hydractl/provision index 7928e1b..844debb 100755 --- a/share/hydractl/provision +++ b/share/hydractl/provision @@ -116,15 +116,21 @@ if [ ! -z "$1" ]; then if [ -f "$1" ]; then echo "Using configuration from file $1..." source "$1" - if [ -f "$1.conf" ]; then + elif [ -f "$1.conf" ]; then echo "Using configuration from file $1.conf..." source "$1.conf" - if [ -f "$HYDRA_FOLDER/config/provision/$1" ]; then + elif [ -f "$HYDRA_FOLDER/config/provision/$1" ]; then echo "Using configuration from $HYDRA_FOLDER/config/provision/$1..." source "$1" - if [ -f "$HYDRA_FOLDER/config/provision/$1.conf" ]; then + elif [ -f "$HYDRA_FOLDER/config/provision/$1.conf" ]; then echo "Using configuration from $HYDRA_FOLDER/config/provision/$1.conf..." source "$1.conf" + elif [ -f "$APP_BASE/share/config/provision/$1" ]; then + echo "Using configuration from $APP_BASE/share/config/provision/$1..." + source "$1" + elif [ -f "$APP_BASE/share/config/provision/$1.conf" ]; then + echo "Using configuration from $APP_BASE/share/config/provision/$1.conf..." + source "$1.conf" else echo "File not found: $1" exit 1 -- cgit v1.2.3