From aef3a68d2b3a15aa9ac8920c520787b0685e9b06 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 25 Nov 2014 11:55:25 -0600 Subject: [PATCH 1/2] fix app plugin that was always searching for empty app name --- plugins/apps/commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/apps/commands b/plugins/apps/commands index 2fed52a7e..8b3f5b25d 100755 --- a/plugins/apps/commands +++ b/plugins/apps/commands @@ -9,7 +9,7 @@ case "$1" in apps:create) [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1 - [[ -d "$DOKKU_ROOT/$APP" ]] && echo " ! Name is already taken" && exit 1 + [[ -d "$DOKKU_ROOT/$2" ]] && echo " ! Name is already taken" && exit 1 APP="$2" mkdir -p "$DOKKU_ROOT/$APP" From 4ae8cf8180cec5493bf012703dc49c55cacc07e8 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 25 Nov 2014 11:56:05 -0600 Subject: [PATCH 2/2] fix search for apps if DOKKU_ROOT is a symlink --- plugins/apps/commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/apps/commands b/plugins/apps/commands index 8b3f5b25d..d15121083 100755 --- a/plugins/apps/commands +++ b/plugins/apps/commands @@ -4,7 +4,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x case "$1" in apps) echo "=== My Apps" - find $DOKKU_ROOT -maxdepth 1 -type d \( ! -iname ".*" \) -not -path $DOKKU_ROOT/tls | sed 's|^\./||g' | sed 's|'$DOKKU_ROOT'\/||' | tail -n +2 | sort + find $DOKKU_ROOT -follow -maxdepth 1 -type d \( ! -iname ".*" \) -not -path $DOKKU_ROOT/tls | sed 's|^\./||g' | sed 's|'$DOKKU_ROOT'\/||' | tail -n +2 | sort ;; apps:create)