From 8a68c5b4d367a45b57eef4580cff1f058fefcf07 Mon Sep 17 00:00:00 2001
From: creyD <grosserconrad@gmail.com>
Date: Fri, 19 Feb 2021 17:45:52 +0100
Subject: [PATCH] Experimenting with a simpler form of composite actions

---
 action.yml    | 29 +++++++++--------------------
 entrypoint.sh |  4 ++--
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/action.yml b/action.yml
index 7fa1af2..988fdf6 100644
--- a/action.yml
+++ b/action.yml
@@ -7,7 +7,7 @@ inputs:
   commit_message:
     description: Commit message, will be ignored if used with same_commit
     required: false
-    default: 'Prettified Code!'
+    default: "Prettified Code!"
   same_commit:
     description: Update the current commit instead of creating a new one
     required: false
@@ -18,11 +18,11 @@ inputs:
   file_pattern:
     description: File pattern used for `git add`, can't be used with only_changed!
     required: false
-    default: '*'
+    default: "*"
   prettier_options:
     description: Options for the `prettier` command
     required: false
-    default: '--write **/*.js'
+    default: "--write **/*.js"
   dry:
     description: Running the script in dry mode just shows whether there are files that should be prettified or not
     required: false
@@ -38,26 +38,15 @@ inputs:
   prettier_plugins:
     description: Install Prettier plugins, i.e. `@prettier/prettier-php @prettier/some-other-plugin`
     required: false
-    default: ''
+    default: ""
 
 runs:
-  using: 'composite'
+  using: "composite"
   steps:
-    - name: prettier
+    - name: Prettify code!
       shell: bash
-      run: >-
-        PATH=$(cd $GITHUB_ACTION_PATH; npm bin):$PATH
-        INPUT_COMMIT_MESSAGE="${{ inputs.commit_message }}"
-        INPUT_COMMIT_OPTIONS="${{ inputs.commit_options }}"
-        INPUT_DRY="${{ inputs.dry }}"
-        INPUT_FILE_PATTERN="${{ inputs.file_pattern }}"
-        INPUT_ONLY_CHANGED="${{ inputs.only_changed }}"
-        INPUT_PRETTIER_OPTIONS="${{ inputs.prettier_options }}"
-        INPUT_PRETTIER_PLUGINS="${{ inputs.prettier_plugins }}"
-        INPUT_PRETTIER_VERSION="${{ inputs.prettier_version }}"
-        INPUT_SAME_COMMIT="${{ inputs.same_commit }}"
-        $GITHUB_ACTION_PATH/entrypoint.sh
+      run: ${{ github.action_path }}/entrypoint.sh
 
 branding:
-  icon: 'award'
-  color: 'green'
+  icon: "award"
+  color: "green"
diff --git a/entrypoint.sh b/entrypoint.sh
index 9a3812a..afc91d6 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -37,10 +37,10 @@ fi
 echo "Installing prettier..."
 case $INPUT_PRETTIER_VERSION in
     false)
-        npm install --silent $maybe_global prettier
+        npm install --silent -g prettier
         ;;
     *)
-        npm install --silent $maybe_global prettier@$INPUT_PRETTIER_VERSION
+        npm install --silent -g prettier@$INPUT_PRETTIER_VERSION
         ;;
 esac