diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-09-21 23:34:50 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-09-21 23:34:50 -0300 |
| commit | e2ebab8ff267604c65157e6a7c9765541bdf8adb (patch) | |
| tree | 5f9216958c4e55cdaef5dcf18de1058bb031fb86 /share | |
| parent | dce9c6b35b92fd56c34df71bed1caa40af0604ec (diff) | |
| download | hydra-e2ebab8ff267604c65157e6a7c9765541bdf8adb.tar.gz hydra-e2ebab8ff267604c65157e6a7c9765541bdf8adb.tar.bz2 | |
Even more provision config locations
Diffstat (limited to 'share')
| -rwxr-xr-x | share/hydractl/provision | 12 |
1 files changed, 9 insertions, 3 deletions
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 |