From 96e21d9866cfc7b853f5cb8728ff2f7d7409ea84 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 26 Sep 2015 12:12:26 -0300 Subject: Provision fixes for raspi --- lib/hydra/provision | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'lib') diff --git a/lib/hydra/provision b/lib/hydra/provision index 5c85e04..1c24129 100644 --- a/lib/hydra/provision +++ b/lib/hydra/provision @@ -1,31 +1,31 @@ #!/bin/bash # Load provision configuration -function hydra_provision_load_config { -if [ ! -z "$1" ]; then - if [ -f "$1" ]; then - echo "Using configuration from file $1..." - source "$1" - elif [ -f "$1.conf" ]; then - echo "Using configuration from file $1.conf..." - source "$1.conf" - elif [ -f "$HYDRA_FOLDER/config/provision/$1" ]; then - echo "Using configuration from $HYDRA_FOLDER/config/provision/$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 "$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 "$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 "$APP_BASE/share/config/provision/$1.conf" - else - echo "Profile not found: $1" - exit 1 +function hydra_provision_config_load { + if [ ! -z "$1" ]; then + if [ -f "$1" ]; then + echo "Using configuration from file $1..." + source "$1" + elif [ -f "$1.conf" ]; then + echo "Using configuration from file $1.conf..." + source "$1.conf" + elif [ -f "$HYDRA_FOLDER/config/provision/$1" ]; then + echo "Using configuration from $HYDRA_FOLDER/config/provision/$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 "$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 "$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 "$APP_BASE/share/config/provision/$1.conf" + else + echo "Profile not found: $1" + exit 1 + fi fi -fi } # Networking. -- cgit v1.2.3