Use shell scripts for launching tools

wpilibsuite · Sep 14, 2024 · bb81e1d · bb81e1d
1 parent be9df73
commit bb81e1d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/CppToolRunTask.java b/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/CppToolRunTask.java
@@ -77,7 +77,7 @@ private void runToolWindows() {
     private void runToolUnix() {
         Directory toolsFolder = this.toolsFolder.get();
         String toolName = this.toolName.get();
-        File outputFile = toolsFolder.file(toolName + ".py").getAsFile();
+        File outputFile = toolsFolder.file(toolName + ".sh").getAsFile();
         getProject().exec(spec -> {
             spec.setExecutable(outputFile.getAbsolutePath());
             spec.args(getArgumentPath(toolName.toLowerCase()));

diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/ToolInstallTask.java b/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/ToolInstallTask.java
@@ -213,8 +213,8 @@ private static void extractScriptWindows(Directory toolsFolder, String toolName)
     }
 
     private static void extractScriptUnix(Project project, Directory toolsFolder, String toolName) {
-        File outputFile = toolsFolder.file(toolName + ".py").getAsFile();
-        try (InputStream it = ToolInstallTask.class.getResourceAsStream("/ScriptBase.py")) {
+        File outputFile = toolsFolder.file(toolName + ".sh").getAsFile();
+        try (InputStream it = ToolInstallTask.class.getResourceAsStream("/ScriptBase.sh")) {
             ResourceGroovyMethods.setText(outputFile, IOGroovyMethods.getText(it));
         } catch (IOException e) {
             throw new RuntimeException(e);

diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/ToolRunTask.java b/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/ToolRunTask.java
@@ -76,7 +76,7 @@ private void runToolWindows() {
     private void runToolUnix() {
         Directory toolsFolder = this.toolsFolder.get();
         String toolName = this.toolName.get();
-        File outputFile = toolsFolder.file(toolName + ".py").getAsFile();
+        File outputFile = toolsFolder.file(toolName + ".sh").getAsFile();
         getProject().exec(spec -> {
             spec.setExecutable(outputFile.getAbsolutePath());
         });

diff --git a/src/main/resources/ScriptBase.sh b/src/main/resources/ScriptBase.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+SCRIPT_PATH="$(dirname "$(realpath -s "$0")")"
+SCRIPT_NAME="$(basename "$(realpath -s "$0")")"
+SCRIPT_BASE="$(basename -s .sh "$SCRIPT_NAME")"
+JAR_NAME="$SCRIPT_BASE.jar"
+JDK_DIR="$(realpath "$SCRIPT_PATH/../jdk/bin/java")"
+
+echo "SCRIPT_PATH: $SCRIPT_PATH"
+echo "SCRIPT_NAME: $SCRIPT_NAME"
+echo "SCRIPT_BASE: $SCRIPT_BASE"
+echo "JAR_NAME: $JAR_NAME"
+echo "JDK_DIR: $JDK_DIR"
+
+if ! "$JDK_DIR" -jar "$JAR_NAME"; then
+    echo "ERROR launching $SCRIPT_BASE using $JDK_DIR"
+    if ! "$JAVA_HOME/bin/java" -jar "$JAR_NAME"; then
+        echo "ERROR launching $SCRIPT_BASE using $JAVA_HOME"
+        if ! java -jar "$JAR_NAME"; then
+            echo "ERROR launching $SCRIPT_BASE using java from path: $PATH"
+        fi
+    fi
+fi