Merge pull request #8451 from mykolasolodukha/fix/client-network-commands-app-prepend
Fix client prepending `--app` for non-app commands
This commit is contained in:
@@ -183,7 +183,7 @@ main() {
|
|||||||
ssh -p "$DOKKU_PORT" "dokku@$DOKKU_REMOTE_HOST" apps
|
ssh -p "$DOKKU_PORT" "dokku@$DOKKU_REMOTE_HOST" apps
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
APP=$(random_name)
|
APP=$(fn-random-name)
|
||||||
counter=$((counter + 1))
|
counter=$((counter + 1))
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -238,8 +238,13 @@ main() {
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
[[ " apps certs help ls nginx shell storage trace version " == *" $CMD "* ]] && unset APP
|
[[ " apps certs help ls nginx shell storage trace version " == *" $CMD "* ]] && unset APP
|
||||||
[[ " certs:chain domains:add-global domains:remove-global domains:set-global ps:restore " == *" $CMD "* ]] && unset APP
|
[[ " certs:chain domains:add-global domains:clear-global domains:remove-global domains:set-global ps:restore " == *" $CMD "* ]] && unset APP
|
||||||
[[ " storage:ensure-directory " == *" $CMD "* ]] && unset APP
|
[[ " storage:ensure-directory " == *" $CMD "* ]] && unset APP
|
||||||
|
[[ " network:create network:destroy network:exists network:info network:list network:rebuildall " == *" $CMD "* ]] && unset APP
|
||||||
|
[[ " logs:vector-logs logs:vector-start logs:vector-stop " == *" $CMD "* ]] && unset APP
|
||||||
|
[[ " scheduler-k3s:cluster:add scheduler-k3s:cluster:list scheduler-k3s:cluster:remove " == *" $CMD "* ]] && unset APP
|
||||||
|
[[ " scheduler-k3s:ensure-charts scheduler-k3s:initialize scheduler-k3s:show-kubeconfig scheduler-k3s:uninstall " == *" $CMD "* ]] && unset APP
|
||||||
|
[[ " scheduler-k3s:profiles:add scheduler-k3s:profiles:list scheduler-k3s:profiles:remove " == *" $CMD "* ]] && unset APP
|
||||||
[[ "$CMD" =~ events*|plugin*|ssh-keys* ]] && unset APP
|
[[ "$CMD" =~ events*|plugin*|ssh-keys* ]] && unset APP
|
||||||
[[ -n "$APP_ARG" ]] && [[ "$APP_ARG" == "--global" ]] && unset APP
|
[[ -n "$APP_ARG" ]] && [[ "$APP_ARG" == "--global" ]] && unset APP
|
||||||
if [[ -n "$@" ]] && [[ -n "$APP" ]]; then
|
if [[ -n "$@" ]] && [[ -n "$APP" ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user