From e563270d905cde263de8d1fdf88bfc0bb9cc0935 Mon Sep 17 00:00:00 2001 From: PenghaiZhang <47203811+PenghaiZhang@users.noreply.github.com> Date: Tue, 24 Dec 2019 09:02:28 +1100 Subject: [PATCH] Ensure using the full path of provided JDK (#31) --- gradle.properties | 2 +- launcher-scripts/Mac-launcher.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5449d10..6ea2b24 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ junitVersion=4.12 -artifactVersion=1.0.2 +artifactVersion=1.0.3 diff --git a/launcher-scripts/Mac-launcher.sh b/launcher-scripts/Mac-launcher.sh index 349f28e..493274c 100755 --- a/launcher-scripts/Mac-launcher.sh +++ b/launcher-scripts/Mac-launcher.sh @@ -1,6 +1,6 @@ #!/bin/zsh OLD_JAVA_HOME=$JAVA_HOME -SCRIPT_DIRECTORY=${0:h} +SCRIPT_DIRECTORY=${0:A:h} export JAVA_HOME=$SCRIPT_DIRECTORY/jdk8u212-b03-jre/Contents/Home "$JAVA_HOME/bin/java" -DLAUNCHER_JAVA_PATH="$JAVA_HOME/bin/java" -jar "$SCRIPT_DIRECTORY/libs/admin.jar" export JAVA_HOME=$OLD_JAVA_HOME