]> gitweb.fluxo.info Git - hydra.git/commitdiff
Provision: fix config file sourcing
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 24 Sep 2015 14:00:48 +0000 (11:00 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 24 Sep 2015 14:00:48 +0000 (11:00 -0300)
share/hydractl/provision

index d1a2cce8884c08cfd553f71b6570f9e83238752b..268e101e836f3ae06f21a5a038e56088b1b2260e 100755 (executable)
@@ -121,16 +121,16 @@ if [ ! -z "$1" ]; then
     source "$1.conf"
   elif [ -f "$HYDRA_FOLDER/config/provision/$1" ]; then
     echo "Using configuration from $HYDRA_FOLDER/config/provision/$1..."
-    source "$1"
+    source "$HYDRA_FOLDER/config/provision/$1"
   elif [ -f "$HYDRA_FOLDER/config/provision/$1.conf" ]; then
     echo "Using configuration from $HYDRA_FOLDER/config/provision/$1.conf..."
-    source "$1.conf"
+    source "$HYDRA_FOLDER/config/provision/$1.conf"
   elif [ -f "$APP_BASE/share/config/provision/$1" ]; then
     echo "Using configuration from $APP_BASE/share/config/provision/$1..."
-    source "$1"
+    source "$APP_BASE/share/config/provision/$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"
+    source "$APP_BASE/share/config/provision/$1.conf"
   else
     echo "Profile not found: $1"
     exit 1