From c54bf12823c5010c8945f4a90a05c8d92ca72914 Mon Sep 17 00:00:00 2001 From: Roman Lumetsberger Date: Wed, 22 Nov 2023 11:58:40 +0000 Subject: [PATCH] Add support for DEPLOY_SSH_REMOTE_SHELL --- deploy/ssh.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/deploy/ssh.sh b/deploy/ssh.sh index c66e2e19..dbe84153 100644 --- a/deploy/ssh.sh +++ b/deploy/ssh.sh @@ -25,6 +25,7 @@ # export DEPLOY_SSH_MULTI_CALL="" # yes or no, default to no or previously saved value # export DEPLOY_SSH_USE_SCP="" yes or no, default to no # export DEPLOY_SSH_SCP_CMD="" defaults to "scp -q" +# export DEPLOY_SSH_REMOTE_SHELL="" # defaults to sh -c # ######## Public functions ##################### @@ -71,6 +72,15 @@ ssh_deploy() { fi _savedeployconf DEPLOY_SSH_CMD "$DEPLOY_SSH_CMD" + # REMOTE_SHELL is optional. If not provided then use sh + _migratedeployconf Le_Deploy_ssh_remote_shell DEPLOY_SSH_REMOTE_SHELL + _getdeployconf DEPLOY_SSH_REMOTE_SHELL + _debug2 DEPLOY_SSH_REMOTE_SHELL "$DEPLOY_SSH_REMOTE_SHELL" + if [ -z "$DEPLOY_SSH_REMOTE_SHELL" ]; then + DEPLOY_SSH_REMOTE_SHELL="sh -c" + fi + _savedeployconf DEPLOY_SSH_REMOTE_SHELL "$DEPLOY_SSH_REMOTE_SHELL" + # BACKUP is optional. If not provided then default to previously saved value or yes. _migratedeployconf Le_Deploy_ssh_backup DEPLOY_SSH_BACKUP _getdeployconf DEPLOY_SSH_BACKUP @@ -428,7 +438,7 @@ _ssh_remote_cmd() { # quotations in bash cmd below intended. Squash travis spellcheck error # shellcheck disable=SC2029 - $_ssh_cmd "$DEPLOY_SSH_USER@$_host" sh -c "'$_cmd'" + $_ssh_cmd "$DEPLOY_SSH_USER@$_host" $DEPLOY_SSH_REMOTE_SHELL "'$_cmd'" _err_code="$?" if [ "$_err_code" != "0" ]; then