github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #2880 from dokku/2849-empty-subcommand

Browse Source 
fix: properly detect empty subcommands
This commit is contained in:
Jose Diaz-Gonzalez
2017-09-02 02:44:30 -04:00
committed by GitHub
parent 15494d85a9 e8f1ce501a
commit 235115af9c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dokku
View File

@@ -125,7 +125,7 @@ execute_dokku_cmd() {
elif [[ -x $PLUGIN_ENABLED_PATH/$PLUGIN_NAME/subcommands/$PLUGIN_CMD ]]; then elif [[ -x $PLUGIN_ENABLED_PATH/$PLUGIN_NAME/subcommands/$PLUGIN_CMD ]]; then
"$PLUGIN_ENABLED_PATH/$PLUGIN_NAME/subcommands/$PLUGIN_CMD" "$@" "$PLUGIN_ENABLED_PATH/$PLUGIN_NAME/subcommands/$PLUGIN_CMD" "$@"
implemented=1 implemented=1
elif [[ -x $PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}/subcommands/${1#*:} ]]; then elif [[ -x $PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}/subcommands/${1#*:} ]] && [[ -n "${1#*:}" ]]; then
"$PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}/subcommands/${1#*:}" "$@" "$PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}/subcommands/${1#*:}" "$@"
implemented=1 implemented=1
fi fi

6
tests/unit/40_core_2.bats
View File

@@ -50,10 +50,16 @@ build_nginx_config() {
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_failure assert_failure
run /bin/bash -c "dokku fakecommand 2>&1 | grep -q 'is not a dokku command'" run /bin/bash -c "dokku fakecommand 2>&1 | grep -q 'is not a dokku command'"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run /bin/bash -c "dokku apps: 2>&1 | grep -q 'is not a dokku command'"
echo "output: "$output
echo "status: "$status
assert_success
} }
@test "(core) urls (non-ssl)" { @test "(core) urls (non-ssl)" {