From fdaab9667d5b07770d75590bf8a23659ead45a06 Mon Sep 17 00:00:00 2001
From: Webber <webber@takken.io>
Date: Sun, 24 Nov 2019 20:42:36 +0100
Subject: [PATCH] Convert ENV to ARGS

---
 .github/workflows/main.yml       |  5 ++---
 request-activation/action.yml    | 19 +++++++++++++++++++
 request-activation/entrypoint.sh | 18 +++++++++++-------
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8a6abc1..079a7e2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,6 @@ jobs:
       # Configure generic activation (local to the actions container)
       - name: Request activation
         uses: ./request-activation
-        inputs:
-          args:
-            unityLicense: ${{ secrets.UNITY_LICENSE }}
+        with:
+          unityLicense: ${{ secrets.UNITY_LICENSE }}
 
diff --git a/request-activation/action.yml b/request-activation/action.yml
index 8d248ed..1c2e850 100644
--- a/request-activation/action.yml
+++ b/request-activation/action.yml
@@ -3,6 +3,25 @@ description: 'Request activation using credentials or license file'
 inputs:
   unityLicense:
     description: 'Unity License for activating Unity Personal'
+    required: false
+    default: 'none'
+  unitySerial:
+    description: 'Unity serial for activation Unity Professional'
+    required: false
+    default: 'none'
+  unityEmail:
+    description: 'Unity account email for activation Unity Professional'
+    required: false
+    default: 'none'
+  unityPassword:
+    description: 'Unity account password for activation Unity Professional'
+    required: false
+    default: 'none'
 runs:
   using: 'docker'
   image: 'Dockerfile'
+  args:
+    - ${{ inputs.unityLicense }}
+    - ${{ inputs.unitySerail }}
+    - ${{ inputs.unityEmail }}
+    - ${{ inputs.unityPassword }}
diff --git a/request-activation/entrypoint.sh b/request-activation/entrypoint.sh
index ab946e8..e226c0e 100644
--- a/request-activation/entrypoint.sh
+++ b/request-activation/entrypoint.sh
@@ -2,7 +2,12 @@
 
 set -e
 
-if [[ ! -z "$UNITY_LICENSE" ]]; then
+UNITY_LICENSE=$1
+UNITY_SERIAL=$2
+UNITY_EMAIL=$3
+UNITY_PASSWORD=$4
+
+if [[ -n "$UNITY_LICENSE" ]] && [[ "$UNITY_LICENSE" != "none" ]]; then
   #
   # PERSONAL LICENSE MODE
   #
@@ -46,13 +51,12 @@ else
   #
   xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
     /opt/Unity/Editor/Unity \
-      -logFile /dev/stdout \
       -batchmode \
-      -username "$UNITY_EMAIL" \
-      -password "$UNITY_PASSWORD" \
-      -serial "$UNITY_SERIAL" \
       -nographics \
-      -verbose \
+      -logFile /dev/stdout \
       -quit \
-      -projectPath "$(pwd)"
+      -serial "$UNITY_SERIAL" \
+      -username "$UNITY_EMAIL" \
+      -password "$UNITY_PASSWORD"
+
 fi