Commit dist files

* Add remove option

* [auto] Update compiled version

* Add fixes

* [auto] Update compiled version

* Update docs

.github/workflows/build.yml

@@ -3,6 +3,8 @@ on:
   push:
     branches-ignore:
       - dist
+    paths:
+      - src/**
 
 jobs:
   build:

.github/workflows/versioning.yml

@@ -2,7 +2,7 @@ name: Keep the versions up-to-date
 
 on:
   release:
-    types: [published]
+    types: [published, edited]
 
 jobs:
   actions-tagger:

README.md

@@ -10,57 +10,59 @@ This action lets you choose the path that you want to use when adding & committi
 Add a step like this to your workflow:
 
 ```yaml
-- name: Commit changes # This is the step name that will be displayed in your runs
-  uses: EndBug/add-and-commit@v2 # You can change this to use a specific version
-  with: # See more info about inputs below
+- uses: EndBug/add-and-commit@v4 # You can change this to use a specific version
+  with:
+    # The arguments for the git add command (see the paragraph below for more info)
+    # Default: '.'
+    add: 'src'
+
+    # The name of the user that will be displayed as the author of the commit
+    # Default: author of the commit that triggered the run
     author_name: Your Name
+
+    # The The email of the user that will be displayed as the author of the commit
+    # Default: author of the commit that triggered the run
     author_email: mail@example.com
-    cwd: "."
-    message: "Your commit message"
-    path: "."
-    pattern: "*.js"
-    force: false
+
+    # The local path to the directory where your repository is located. You should use actions/checkout first to set it up
+    # Default: '.'
+    cwd: './path/to/the/repo'
+
+    # Whether to use the --force option on git add, in order to bypass eventual gitignores
+    # Default: false
+    force: true
+
+    # The message for the commit
+    # Default: 'Commit from GitHub Actions'
+    message: 'Your commit message'
+
+    #  The arguments for the git rm command (see the paragraph below for more info)
+    # Default: ''
+    remove: "./dir/old_file.js"
+
   env:
+    # This is necessary in order to push a commit to the repo
     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Leave this line unchanged
 ```
 
-### Inputs:
-
-- `author_name` : the name of the user that will be displayed as the author of the commit, defaults to the author of the commit that triggered the run
-- `author_email` : the email of the user that will be displayed as the author of the commit, defaults to the author of the commit that triggered the run
-- `cwd` : the working directory in which your repository is located, defaults to `.`
-- `message` : the message for the commit
-- `path` : the path(s) to stage files from
-- `pattern` : the pattern that matches file names
-- `force` : whether to use the force option on git add, in order to bypass eventual gitignores
-
 ### Environment variables:
 
 The only `env` variable required is the token for the action to run: GitHub generates one automatically, but you need to pass it through `env` to make it available to actions. You can find more about `GITHUB_TOKEN` [here](https://help.github.com/en/articles/virtual-environments-for-github-actions#github_token-secret).  
 With that said, you can just copy the example line and don't worry about it. If you do want to use a different token you can pass that in, but I wouldn't see any possible advantage in doing so.
 
+### Adding files:
+
+The action adds files using a regular `git add` command, so you can put every kind of argument in the `add` option. For example, if you don't want it to use a recursive behavior: `$(find . -maxdepth 1 -name *.js)`.
+The script will not stop if one the git commands fails. E.g.: if your command shows a "fatal: pathspec 'yourFile' did not match any files" error the action will go on.
+
 ### Deleting files:
 
-This action only **adds** files so in order to commit a file deletion you need to stage that separately: for that, you can run `git rm` in a previous step. Here's a quick example:
+You can delete files with the `remove` option: that runs a `git rm` command that will stage the files in the given path for removal. 
+The script will not stop if one the git commands fails. E.g.: if your command shows a "fatal: pathspec 'yourFile' did not match any files" error the action will go on.
 
-```yaml
-- run: git rm delete_me.txt
+### Examples:
 
-- uses: EndBug/add-and-commit@v2
-  with:
-    author_name: Your Name
-    author_email: mail@example.com
-    message: "Remove file"
-    path: "."
-    pattern: "*.js"  # The path is not important, the file will get removed anyway: that means you can still use the action as usual
-    force: true
-  env:
-    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-```
-
-### Example:
-
-You want to lint your JavaScript files, located in the `src` folder, with ESLint so that fixable changes are done without your intervention. You can use a workflow like this:
+Do you want to lint your JavaScript files, located in the `src` folder, with ESLint, so that fixable changes are done without your intervention? You can use a workflow like this:
 
 ```yaml
 name: Lint source code
@@ -86,13 +88,12 @@ jobs:
       run: eslint "src/**" --fix
 
     - name: Commit changes
-      uses: EndBug/add-and-commit@v2 
+      uses: EndBug/add-and-commit@v4
       with:
         author_name: Your Name
         author_email: mail@example.com
         message: "Your commit message"
-        path: "."
-        pattern: "*.js"
+        add: "*.js"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
@@ -118,11 +119,10 @@ jobs:
       - run: echo "123" > ./pathToRepo/file.txt
 
       # ...and then use the action as you would normally do, but providing the path to the repo
-      - uses: EndBug/add-and-commit@v2
+      - uses: EndBug/add-and-commit@v4
         with:
           message: "Add the very useful text file"
-          path: "."
-          pattern: "*.txt"
+          add: "*.txt"
           cwd: "./pathToRepo/"
           force: true
         env:

action.yml

@@ -2,6 +2,10 @@ name: Add & Commit
 description: Add & commit files from a path directly from GitHub Actions
 
 inputs:
+  add:
+    description: Arguments for the git add command
+    required: false
+    default: "."
   author_name:
     description: The name of the user that will be displayed as the author of the commit
     required: false
@@ -20,14 +24,10 @@ inputs:
     description: The message for the commit
     required: false
     default: Commit from GitHub Actions
-  path:
-    description: The path to stage files from
+  remove:
+    description: Arguments for the git rm command
     required: false
-    default: "."
-  pattern:
-    description: The pattern that mathces file names
-    required: false
-    default: "*.*"
+    default: ""
 
 runs:
   using: node12

lib/main.js

@@ -1 +1 @@
-"use strict";var __importStar=this&&this.__importStar||function(a){if(a&&a.__esModule)return a;var b={};if(null!=a)for(var c in a)Object.hasOwnProperty.call(a,c)&&(b[c]=a[c]);return b["default"]=a,b};Object.defineProperty(exports,"__esModule",{value:!0});const core=__importStar(require("@actions/core")),shell=__importStar(require("shelljs")),path=__importStar(require("path"));try{checkInputs(),shell.exec(path.join(__dirname,"../src/entrypoint.sh"))}catch(a){core.setFailed(a)}function checkInputs(){const a=process.env.GITHUB_EVENT_PATH;if(a){const{author:b}=require(a).head_commit;process.env.INPUT_AUTHOR_NAME||(process.env.INPUT_AUTHOR_NAME=b.name),process.env.INPUT_AUTHOR_EMAIL||(process.env.INPUT_AUTHOR_EMAIL=b.email)}else core.warning("No event path available, unable to fetch author info."),process.env.INPUT_AUTHOR_NAME||(process.env.INPUT_AUTHOR_NAME="Add & Commit Action"),process.env.INPUT_AUTHOR_EMAIL||(process.env.INPUT_AUTHOR_EMAIL="actions@github.com");core.info(`Using '${process.env.INPUT_AUTHOR_NAME} <${process.env.INPUT_AUTHOR_EMAIL}>' as author.`)}
+"use strict";var __importStar=this&&this.__importStar||function(a){if(a&&a.__esModule)return a;var b={};if(null!=a)for(var c in a)Object.hasOwnProperty.call(a,c)&&(b[c]=a[c]);return b["default"]=a,b};Object.defineProperty(exports,"__esModule",{value:!0});const core=__importStar(require("@actions/core")),shell=__importStar(require("shelljs")),path=__importStar(require("path"));try{checkInputs(),shell.exec(path.join(__dirname,"../src/entrypoint.sh"))}catch(a){core.setFailed(a)}function checkInputs(){const a=process.env.GITHUB_EVENT_PATH;if(a){const{author:b}=require(a).head_commit;setDefault("author_name",b.name),setDefault("author_email",b.email)}else core.warning("No event path available, unable to fetch author info."),setDefault("author_name","Add & Commit Action"),setDefault("author_email","actions@github.com");core.info(`Using '${core.getInput("author_name")} <${core.getInput("author_email")}>' as author.`)}function setDefault(a,b){const c="INPUT_"+a.toUpperCase();process.env[c]||(process.env[c]=b)}

node_modules/@actions/core/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "@actions/core@1.2.0",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "@actions/core@1.2.0",
@@ -27,7 +27,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.0.tgz",
   "_spec": "1.2.0",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "bugs": {
     "url": "https://github.com/actions/toolkit/issues"
   },

node_modules/balanced-match/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "balanced-match@1.0.0",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "balanced-match@1.0.0",
@@ -26,7 +26,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
   "_spec": "1.0.0",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "Julian Gruber",
     "email": "mail@juliangruber.com",

node_modules/brace-expansion/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "brace-expansion@1.1.11",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "brace-expansion@1.1.11",
@@ -26,7 +26,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
   "_spec": "1.1.11",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "Julian Gruber",
     "email": "mail@juliangruber.com",

node_modules/concat-map/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "concat-map@0.0.1",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "concat-map@0.0.1",
@@ -26,7 +26,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
   "_spec": "0.0.1",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "James Halliday",
     "email": "mail@substack.net",

node_modules/fs.realpath/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "fs.realpath@1.0.0",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "fs.realpath@1.0.0",
@@ -27,7 +27,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
   "_spec": "1.0.0",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",

node_modules/glob/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "glob@7.1.4",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "glob@7.1.4",
@@ -27,7 +27,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
   "_spec": "7.1.4",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",

node_modules/inflight/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "inflight@1.0.6",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "inflight@1.0.6",
@@ -27,7 +27,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
   "_spec": "1.0.6",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",

node_modules/inherits/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "inherits@2.0.4",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "inherits@2.0.4",
@@ -27,7 +27,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
   "_spec": "2.0.4",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "browser": "./inherits_browser.js",
   "bugs": {
     "url": "https://github.com/isaacs/inherits/issues"

node_modules/interpret/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "interpret@1.2.0",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "interpret@1.2.0",
@@ -26,7 +26,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
   "_spec": "1.2.0",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "Gulp Team",
     "email": "team@gulpjs.com",

node_modules/minimatch/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "minimatch@3.0.4",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "minimatch@3.0.4",
@@ -28,7 +28,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
   "_spec": "3.0.4",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",

node_modules/once/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "once@1.4.0",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "once@1.4.0",
@@ -28,7 +28,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
   "_spec": "1.4.0",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",

node_modules/path-is-absolute/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "path-is-absolute@1.0.1",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "path-is-absolute@1.0.1",
@@ -27,7 +27,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
   "_spec": "1.0.1",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",

node_modules/path-parse/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "path-parse@1.0.6",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "path-parse@1.0.6",
@@ -26,7 +26,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
   "_spec": "1.0.6",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "Javier Blanco",
     "email": "http://jbgutierrez.info"

node_modules/rechoir/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "rechoir@0.6.2",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "rechoir@0.6.2",
@@ -26,7 +26,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
   "_spec": "0.6.2",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "Tyler Kellen",
     "url": "http://goingslowly.com/"

node_modules/resolve/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "resolve@1.13.1",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "resolve@1.13.1",
@@ -27,7 +27,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/resolve/-/resolve-1.13.1.tgz",
   "_spec": "1.13.1",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "James Halliday",
     "email": "mail@substack.net",

node_modules/shelljs/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "shelljs@0.8.3",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "shelljs@0.8.3",
@@ -26,7 +26,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz",
   "_spec": "0.8.3",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "ava": {
     "serial": true,
     "powerAssert": false

node_modules/wrappy/package.json

@@ -2,7 +2,7 @@
   "_args": [
     [
       "wrappy@1.0.2",
-      "c:\\EndBug\\GitHub\\add-and-commit"
+      "C:\\EndBug\\GitHub\\add-and-commit"
     ]
   ],
   "_from": "wrappy@1.0.2",
@@ -27,7 +27,7 @@
   ],
   "_resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
   "_spec": "1.0.2",
-  "_where": "c:\\EndBug\\GitHub\\add-and-commit",
+  "_where": "C:\\EndBug\\GitHub\\add-and-commit",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "add-and-commit",
-  "version": "2.3.0",
+  "version": "4.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "add-and-commit",
-  "version": "2.3.0",
+  "version": "4.0.0",
   "description": "Add & commit files from a path directly from GitHub Actions",
   "main": "lib/main.js",
   "scripts": {

src/entrypoint.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
-set -eu
+set -u
 
 cd $INPUT_CWD
 echo "Running in $PWD."
 
 # Set up .netrc file with GitHub credentials
 git_setup() {
-  cat <<- EOF > $HOME/.netrc
+    cat <<-EOF >$HOME/.netrc
         machine github.com
         login $GITHUB_ACTOR
         password $GITHUB_TOKEN
@@ -16,33 +16,33 @@ git_setup() {
         password $GITHUB_TOKEN
 EOF
     chmod 600 $HOME/.netrc
-
     git config --global user.email "$INPUT_AUTHOR_EMAIL"
     git config --global user.name "$INPUT_AUTHOR_NAME"
 }
 
 add() {
-    if $INPUT_FORCE 
-    then find $INPUT_PATH -name "$INPUT_PATTERN" | while read x; do git add -f $x; done
-    else find $INPUT_PATH -name "$INPUT_PATTERN" | while read x; do git add $x; done
-    fi
+    if $INPUT_FORCE; then f=-f; else f=; fi
+    git add $INPUT_ADD $f
+}
+
+remove() {
+    if [ -n "$INPUT_REMOVE" ]; then git rm $INPUT_REMOVE; fi
 }
 
 # This is needed to make the check work for untracked files
-echo "Staging files in commit path..."
+echo "Staging files..."
 add
+remove
 
 echo "Checking for uncommitted changes in the git working tree..."
 # This section only runs if there have been file changes
-if ! git diff --cached --exit-code
-then
+if ! git diff --cached --exit-code; then
     git_setup
 
-    git fetch 
+    git fetch
 
     # Verify if the branch needs to be created
-    if ! git rev-parse --verify --quiet "${GITHUB_REF:11}"
-    then 
+    if ! git rev-parse --verify --quiet "${GITHUB_REF:11}"; then
         echo "Creating branch..."
         git branch "${GITHUB_REF:11}"
     fi
@@ -51,9 +51,18 @@ then
     echo "Switching branch..."
     git checkout "${GITHUB_REF:11}"
 
+    echo "Pulling from remote..."
+    git fetch && git pull
+
+    echo "Resetting files..."
+    git reset
+
     echo "Adding files..."
     add
 
+    echo "Removing files..."
+    remove
+
     echo "Creating commit..."
     git commit -m "$INPUT_MESSAGE" --author="$INPUT_AUTHOR_NAME <$INPUT_AUTHOR_EMAIL>"
 

src/main.ts

@@ -5,20 +5,25 @@ import * as path from 'path'
 try {
   checkInputs()
   shell.exec(path.join(__dirname, '../src/entrypoint.sh'))
-} catch (e) {
-  core.setFailed(e)
+} catch (err) {
+  core.setFailed(err)
 }
 
 function checkInputs() {
   const eventPath = process.env.GITHUB_EVENT_PATH
   if (eventPath) {
     const { author } = require(eventPath).head_commit
-    if (!process.env.INPUT_AUTHOR_NAME) process.env.INPUT_AUTHOR_NAME = author.name
-    if (!process.env.INPUT_AUTHOR_EMAIL) process.env.INPUT_AUTHOR_EMAIL = author.email
+    setDefault('author_name', author.name)
+    setDefault('author_email', author.email)
   } else {
     core.warning('No event path available, unable to fetch author info.')
-    if (!process.env.INPUT_AUTHOR_NAME) process.env.INPUT_AUTHOR_NAME = 'Add & Commit Action'
-    if (!process.env.INPUT_AUTHOR_EMAIL) process.env.INPUT_AUTHOR_EMAIL = 'actions@github.com'
+    setDefault('author_name', 'Add & Commit Action')
+    setDefault('author_email', 'actions@github.com')
   }
-  core.info(`Using '${process.env.INPUT_AUTHOR_NAME} <${process.env.INPUT_AUTHOR_EMAIL}>' as author.`)
+  core.info(`Using '${core.getInput('author_name')} <${core.getInput('author_email')}>' as author.`)
+}
+
+function setDefault(input: string, value: string) {
+  const key = 'INPUT_' + input.toUpperCase()
+  if (!process.env[key]) process.env[key] = value
 }