fix: correct app arg parsing and new test

This commit is contained in:
Jose Diaz-Gonzalez committed 2020-12-21 13:36:04 -05:00
1 parent dd1962f92d
commit 2e4c886ab2
2 files changed
+11 -6

No files matched your search

+7 -4
View File
@@ -72,6 +72,9 @@ main() {
skip=false skip=false
continue continue
fi fi
is_flag=false
[[ "$arg" =~ ^--.* ]] && is_flag=true
if [[ "$arg" == "--app" ]]; then if [[ "$arg" == "--app" ]]; then
APP=${args[$next_index]} APP=${args[$next_index]}
@@ -82,10 +85,10 @@ main() {
skip=true skip=true
shift 2 shift 2
elif [[ "$arg" =~ ^--.* ]]; then elif [[ "$arg" =~ ^--.* ]]; then
[[ "$cmd_set" == "true" ]] && APP_ARG="$arg" && break [[ "$cmd_set" == "true" ]] && [[ "$is_flag" == "false" ]] && APP_ARG="$arg" && break
[[ "$arg" == "--trace" ]] && export DOKKU_TRACE=1 && set -x [[ "$arg" == "--trace" ]] && export DOKKU_TRACE=1 && set -x
else else
if [[ "$cmd_set" == "true" ]]; then if [[ "$cmd_set" == "true" ]] && [[ "$is_flag" == "false" ]]; then
APP_ARG="$arg" APP_ARG="$arg"
break break
else else
@@ -110,7 +113,7 @@ main() {
case "$CMD" in case "$CMD" in
apps:create) apps:create)
if [[ -z "$APP_ARG" ]]; then if [[ -z "$APP" ]] && [[ -z "$APP_ARG" ]]; then
APP=$(fn-random-name) APP=$(fn-random-name)
counter=0 counter=0
while ssh -p "$DOKKU_PORT" "dokku@$DOKKU_REMOTE_HOST" apps 2>/dev/null | grep -q "$APP"; do while ssh -p "$DOKKU_PORT" "dokku@$DOKKU_REMOTE_HOST" apps 2>/dev/null | grep -q "$APP"; do
@@ -123,7 +126,7 @@ main() {
counter=$((counter + 1)) counter=$((counter + 1))
fi fi
done done
else elif [[ -z "$APP" ]]; then
APP="$APP_ARG" APP="$APP_ARG"
fi fi
if git remote add "$DOKKU_GIT_REMOTE" "dokku@$DOKKU_REMOTE_HOST:$APP"; then if git remote add "$DOKKU_GIT_REMOTE" "dokku@$DOKKU_REMOTE_HOST:$APP"; then
+4 -2
View File
@@ -33,12 +33,14 @@ teardown() {
run /bin/bash -c "dokku config:set --global GLOBAL_KEY=VALUE" run /bin/bash -c "dokku config:set --global GLOBAL_KEY=VALUE"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success
run /bin/bash -c "dokku config:set $TEST_APP GLOBAL_KEY=VALUE" run /bin/bash -c "dokku config:set $TEST_APP APP_KEY=VALUE"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success
run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh config:export --merged --format shell" run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh --app $TEST_APP config:export --merged --format shell"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success