From 160089695654c70ea73e153be11a8998f037ec05 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 15 May 2016 18:44:00 -0400 Subject: [PATCH] Move setting of PLUGIN_BASE_PATH to config --- commands | 4 ---- config | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commands b/commands index f9bf4bb..7007467 100755 --- a/commands +++ b/commands @@ -3,10 +3,6 @@ source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config" [[ " help $PLUGIN_COMMAND_PREFIX:help " == *" $1 "* ]] || [[ "$1" == "$PLUGIN_COMMAND_PREFIX:"* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT" set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x -PLUGIN_BASE_PATH="$PLUGIN_PATH" -if [[ -n $DOKKU_API_VERSION ]]; then - PLUGIN_BASE_PATH="$PLUGIN_ENABLED_PATH" -fi source "$PLUGIN_BASE_PATH/common/functions" source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/functions" diff --git a/config b/config index 6b51d05..d31d55c 100755 --- a/config +++ b/config @@ -12,3 +12,7 @@ export PLUGIN_IMAGE=$REDIS_IMAGE export PLUGIN_IMAGE_VERSION=$REDIS_IMAGE_VERSION export PLUGIN_SCHEME="redis" export PLUGIN_SERVICE="Redis" +export PLUGIN_BASE_PATH="$PLUGIN_PATH" +if [[ -n $DOKKU_API_VERSION ]]; then + export PLUGIN_BASE_PATH="$PLUGIN_ENABLED_PATH" +fi