From a9474e2eb85c58c44fed4cf41e4d856e3ba1d42e Mon Sep 17 00:00:00 2001 From: insyri <60794909+insyri@users.noreply.github.com> Date: Sat, 4 Dec 2021 18:46:31 -0500 Subject: [PATCH 1/2] Corrected if/else for INPUT_COMMIT_DESCRIPTION. --- entrypoint.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 7a764a4..dcb1037 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -113,6 +113,15 @@ if _git_changed; then git add "${INPUT_FILE_PATTERN}" || echo "Problem adding your files with pattern ${INPUT_FILE_PATTERN}" fi + # Check if the commit description was populated + IF_COMMIT_DESC="" + if [ "$INPUT_COMMIT_DESCRIPTION" != "" ] + then + $IF_COMMIT_DESC=" -m '$INPUT_COMMIT_DESCRIPTION'" + else + $IF_COMMIT_DESC="" + fi + # Commit and push changes back if $INPUT_SAME_COMMIT; then echo "Amending the current commit..." @@ -120,7 +129,7 @@ if _git_changed; then git commit --amend --no-edit git push origin -f else - git commit -m "$INPUT_COMMIT_MESSAGE" if [ "$INPUT_COMMIT_DESCRIPTION" != "" ]; then echo '-m "$INPUT_COMMIT_DESCRIPTION"' fi --author="$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"} || echo "No files added to commit" + git commit -m "$INPUT_COMMIT_MESSAGE""$IF_COMMIT_DESC" --author="$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"} || echo "No files added to commit" git push origin ${INPUT_PUSH_OPTIONS:-} fi echo "Changes pushed successfully." From f44961013c38b3cfc3f0693ac5a57e35290ccd24 Mon Sep 17 00:00:00 2001 From: insyri <60794909+insyri@users.noreply.github.com> Date: Sat, 4 Dec 2021 18:58:13 -0500 Subject: [PATCH 2/2] Variable assignment fix, issued via CodeFactor --- entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index dcb1037..36239e4 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -117,9 +117,9 @@ if _git_changed; then IF_COMMIT_DESC="" if [ "$INPUT_COMMIT_DESCRIPTION" != "" ] then - $IF_COMMIT_DESC=" -m '$INPUT_COMMIT_DESCRIPTION'" + IF_COMMIT_DESC=" -m '$INPUT_COMMIT_DESCRIPTION'" else - $IF_COMMIT_DESC="" + IF_COMMIT_DESC="" fi # Commit and push changes back