From d2658b18121d9d6b4d2d5fdd29476b7d16d1de31 Mon Sep 17 00:00:00 2001 From: Marco Dalla Santa Date: Wed, 8 Sep 2021 23:41:27 +0200 Subject: [PATCH] fix(pwd): changed error handling --- with_pass.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/with_pass.sh b/with_pass.sh index ffe0765..86ff182 100644 --- a/with_pass.sh +++ b/with_pass.sh @@ -2,18 +2,21 @@ PRE_UPLOAD=${INPUT_PRE_UPLOAD} if [ ! -z "$PRE_UPLOAD" ]; then echo "👌 Executing pre-upload script..." && sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$INPUT_PRE_UPLOAD && exit" && - echo "✅ Executed pre-upload script"; + echo "✅ Executed pre-upload script" || + echo "😢 Something went wrong during pre-upload script" && exit 1; fi echo "🚚 Uploading via scp..." && sshpass -p ${PASSWORD} scp ${INPUT_SSH_OPTIONS} ${INPUT_SCP_OPTIONS} -P "${INPUT_PORT}" -r ${INPUT_LOCAL} ${INPUT_USER}@${INPUT_HOST}:"${INPUT_REMOTE}" && -echo "🙌 Uploaded via scp"; +echo "🙌 Uploaded via scp" || +echo "😢 Something went wrong during upload" && exit 1; POST_UPLOAD=${INPUT_POST_UPLOAD} if [ ! -z "$POST_UPLOAD" ]; then echo "👌 Executing post-upload script..." && sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} "$POST_UPLOAD && exit" && - echo "✅ Executed post-upload script"; + echo "✅ Executed post-upload script" || + echo "😢 Something went wrong during post-upload script" && exit 1; fi -sshpass -p ${PASSWORD} ssh ${INPUT_SSH_OPTIONS} ${INPUT_USER}@${INPUT_HOST} [[ -f $FILE_PATH ]] && echo "🎉 Done" || echo "😢 Something went wrong..." && exit 1; \ No newline at end of file +echo "🎉 Done"; \ No newline at end of file