From 6cb219eefca33c1afe30665aa89ad59f501429b0 Mon Sep 17 00:00:00 2001
From: Chris Ottrey <cottrey@zendesk.com>
Date: Wed, 27 Jul 2022 15:36:27 +1000
Subject: [PATCH 1/2] Install A JVM implementation of the Jsonnet

---
 install-jsonnet.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/install-jsonnet.sh b/install-jsonnet.sh
index e9dc539..a4a964d 100755
--- a/install-jsonnet.sh
+++ b/install-jsonnet.sh
@@ -1,11 +1,9 @@
 #!/bin/bash -ex
+JSONNET=${JSONNET:-/usr/local/bin/sjsonnet}
 
-# Install go-jsonnet
-version="$1"
-go install "github.com/google/go-jsonnet/cmd/jsonnet@${version}"
-go install "github.com/google/go-jsonnet/cmd/jsonnetfmt@${version}"
-go install "github.com/google/go-jsonnet/cmd/jsonnet-deps@${version}"
-go install "github.com/google/go-jsonnet/cmd/jsonnet-lint@${version}"
+# Install https://github.com/databricks/sjsonnet
+version="${1:-0.4.3}"
 
-# Add jsonnet executables to the path for future actions
-echo "$HOME/go/bin" >> "$GITHUB_PATH"
+curl -L "https://github.com/databricks/sjsonnet/releases/download/${version}/sjsonnet.jar" > "$JSONNET"
+
+chmod +x "$JSONNET"

From 38e28cd73ae80f99f6556bbcde855713a992d9c9 Mon Sep 17 00:00:00 2001
From: Chris Ottrey <cottrey@zendesk.com>
Date: Thu, 28 Jul 2022 10:01:38 +1000
Subject: [PATCH 2/2] Install sjonnet alongside all the other Go jsonnet*
 executables

---
 index.js            |  2 ++
 install-jsonnet.sh  | 14 ++++++++------
 install-sjsonnet.sh |  9 +++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100755 install-sjsonnet.sh

diff --git a/index.js b/index.js
index 86b52d9..264c557 100644
--- a/index.js
+++ b/index.js
@@ -6,6 +6,8 @@ const run = async () => {
   try {
     const version = core.getInput('version')
     await exec(path.join(__dirname, 'install-jsonnet.sh'), version)
+
+    await exec(path.join(__dirname, 'install-sjsonnet.sh'), '0.4.3')
   } catch (error) {
     core.setFailed(`Action failed with error: ${error}`)
   }
diff --git a/install-jsonnet.sh b/install-jsonnet.sh
index a4a964d..e9dc539 100755
--- a/install-jsonnet.sh
+++ b/install-jsonnet.sh
@@ -1,9 +1,11 @@
 #!/bin/bash -ex
-JSONNET=${JSONNET:-/usr/local/bin/sjsonnet}
 
-# Install https://github.com/databricks/sjsonnet
-version="${1:-0.4.3}"
+# Install go-jsonnet
+version="$1"
+go install "github.com/google/go-jsonnet/cmd/jsonnet@${version}"
+go install "github.com/google/go-jsonnet/cmd/jsonnetfmt@${version}"
+go install "github.com/google/go-jsonnet/cmd/jsonnet-deps@${version}"
+go install "github.com/google/go-jsonnet/cmd/jsonnet-lint@${version}"
 
-curl -L "https://github.com/databricks/sjsonnet/releases/download/${version}/sjsonnet.jar" > "$JSONNET"
-
-chmod +x "$JSONNET"
+# Add jsonnet executables to the path for future actions
+echo "$HOME/go/bin" >> "$GITHUB_PATH"
diff --git a/install-sjsonnet.sh b/install-sjsonnet.sh
new file mode 100755
index 0000000..3c879f2
--- /dev/null
+++ b/install-sjsonnet.sh
@@ -0,0 +1,9 @@
+#!/bin/bash -ex
+SJSONNET=${SJSONNET:-sjsonnet}
+
+# Install https://github.com/databricks/sjsonnet
+version="${1:-0.4.3}"
+
+curl -L "https://github.com/databricks/sjsonnet/releases/download/${version}/sjsonnet.jar" > "$SJSONNET"
+
+chmod +x "$SJSONNET"