Merge pull request #24 from stefanzweifel/extract-logic-to-lib

Extract methods into lib.sh / Add shellcheck workflow

.github/workflows/shellcheck.yml

@@ -0,0 +1,12 @@
+name: Shellcheck
+
+on: push
+
+jobs:
+  shellcheck:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: shellcheck
+      uses: ludeeus/action-shellcheck@0.1.0

Dockerfile

@@ -11,6 +11,7 @@ LABEL "maintainer"="Stefan Zweifel <hello@stefanzweifel.io>"
 
 RUN apk add git-lfs
 
+COPY lib.sh /lib.sh
 COPY entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["sh", "/entrypoint.sh"]

entrypoint.sh

@@ -1,48 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eu
 
-# Set up .netrc file with GitHub credentials
+source /lib.sh
-git_setup ( ) {
-  cat <<- EOF > $HOME/.netrc
-        machine github.com
-        login $GITHUB_ACTOR
-        password $GITHUB_TOKEN
 
-        machine api.github.com
+_switch_to_repository
-        login $GITHUB_ACTOR
-        password $GITHUB_TOKEN
-EOF
-    chmod 600 $HOME/.netrc
 
-    git config --global user.email "actions@github.com"
+if _git_is_dirty; then
-    git config --global user.name "GitHub Actions"
-}
 
-echo "INPUT_REPOSITORY value: $INPUT_REPOSITORY";
+    _setup_git
 
-cd $INPUT_REPOSITORY
+    _switch_to_branch
 
-# This section only runs if there have been file changes
+    _add_files
-echo "Checking for uncommitted changes in the git working tree."
-if [[ -n "$(git status -s)" ]]
-then
-    git_setup
 
-    echo "INPUT_BRANCH value: $INPUT_BRANCH";
+    _local_commit
 
-    # Switch to branch from current Workflow run
+    _push_to_github
-    git checkout $INPUT_BRANCH
-
-    echo "INPUT_FILE_PATTERN: ${INPUT_FILE_PATTERN}"
-
-    git add "${INPUT_FILE_PATTERN}"
-
-    echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}"
-
-    git commit -m "$INPUT_COMMIT_MESSAGE" --author="$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"}
-
-    git push --set-upstream origin "HEAD:$INPUT_BRANCH"
 else
     echo "Working tree clean. Nothing to commit."
 fi

lib.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+_switch_to_repository() {
+    echo "INPUT_REPOSITORY value: $INPUT_REPOSITORY";
+    cd $INPUT_REPOSITORY
+}
+
+_git_is_dirty() {
+    [[ -n "$(git status -s)" ]]
+}
+
+# Set up .netrc file with GitHub credentials
+_setup_git ( ) {
+  cat <<- EOF > $HOME/.netrc
+        machine github.com
+        login $GITHUB_ACTOR
+        password $GITHUB_TOKEN
+
+        machine api.github.com
+        login $GITHUB_ACTOR
+        password $GITHUB_TOKEN
+EOF
+    chmod 600 $HOME/.netrc
+
+    git config --global user.email "actions@github.com"
+    git config --global user.name "GitHub Actions"
+}
+
+_switch_to_branch() {
+    echo "INPUT_BRANCH value: $INPUT_BRANCH";
+
+    # Switch to branch from current Workflow run
+    git checkout $INPUT_BRANCH
+}
+
+_add_files() {
+    echo "INPUT_FILE_PATTERN: ${INPUT_FILE_PATTERN}"
+    git add "${INPUT_FILE_PATTERN}"
+}
+
+_local_commit() {
+    echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}"
+    git commit -m "$INPUT_COMMIT_MESSAGE" --author="$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"}
+}
+
+_push_to_github() {
+    git push --set-upstream origin "HEAD:$INPUT_BRANCH"
+}