fix: correctly prepend argument to passed ssh args

This commit is contained in:
Jose Diaz-Gonzalez committed 2024-03-13 22:43:49 -04:00
1 parent 6d07fea704
commit ff18061987
1 file changed
+5 -6
+5 -6
View File
@@ -188,14 +188,13 @@ main() {
[[ " storage:ensure-directory " == *" $CMD "* ]] && unset APP [[ " storage:ensure-directory " == *" $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
[[ -n "$@" ]] && [[ -n "$APP" ]] && app_arg="--app $APP" if [[ -n "$@" ]] && [[ -n "$APP" ]]; then
set -- "$APP" "$@"
set -- "--app" "$@"
fi
# echo "ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_REMOTE_HOST -- $app_arg $@" # echo "ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_REMOTE_HOST -- $app_arg $@"
local ssh_args=("-o" "LogLevel=QUIET" "-p" "$DOKKU_PORT" "-t" "dokku@$DOKKU_REMOTE_HOST" "--") local ssh_args=("-o" "LogLevel=QUIET" "-p" "$DOKKU_PORT" "-t" "dokku@$DOKKU_REMOTE_HOST" "--")
if [[ -n "$app_arg" ]]; then ssh_args+=("$@")
ssh_args+=("'$app_arg $@'")
else
ssh_args+=("$@")
fi
ssh "${ssh_args[@]}" || { ssh "${ssh_args[@]}" || {
ssh_exit_code="$?" ssh_exit_code="$?"
echo " ! Failed to execute dokku command over ssh: exit code $?" 1>&2 echo " ! Failed to execute dokku command over ssh: exit code $?" 1>&2