diff --git a/config b/config index 84ccc3f..d39d036 100755 --- a/config +++ b/config @@ -1,7 +1,7 @@ #!/usr/bin/env bash -_DIR="$(dirname $0)" -export REDIS_IMAGE=${REDIS_IMAGE:="$(awk -F '[ :]' '{print $2}' $_DIR/Dockerfile)"} -export REDIS_IMAGE_VERSION=${REDIS_IMAGE_VERSION:="$(awk -F '[ :]' '{print $3}' $_DIR/Dockerfile)"} +_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +export REDIS_IMAGE=${REDIS_IMAGE:="$(awk -F '[ :]' '{print $2}' "${_DIR}/Dockerfile")"} +export REDIS_IMAGE_VERSION=${REDIS_IMAGE_VERSION:="$(awk -F '[ :]' '{print $3}' "${_DIR}/Dockerfile")"} export REDIS_ROOT=${REDIS_ROOT:="$DOKKU_LIB_ROOT/services/redis"} export REDIS_HOST_ROOT=${REDIS_HOST_ROOT:=$REDIS_ROOT} diff --git a/tests/setup.sh b/tests/setup.sh index de1f91e..1eacc11 100644 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -19,7 +19,9 @@ echo "Dokku version $DOKKU_VERSION" export DOKKU_LIB_ROOT="/var/lib/dokku" export DOKKU_PLUGINS_ROOT="$DOKKU_LIB_ROOT/plugins/available" -source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config" +pushd "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")" >/dev/null +source "config" +popd >/dev/null sudo rm -rf "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX" sudo mkdir -p "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX" "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX/subcommands" "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX/scripts" sudo find ./ -maxdepth 1 -type f -exec cp '{}' "$DOKKU_PLUGINS_ROOT/$PLUGIN_COMMAND_PREFIX" \;