X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroPeak.app%2FContents%2FMacOS%2FJavaApplicationStub;fp=micropeak%2FMicroPeak.app%2FContents%2FMacOS%2FJavaApplicationStub;h=0c36006c31e815ae11feb6e328d6d9f95ee4918b;hp=145a260ba76c07cfcb7dffb469b6191049f4d556;hb=c6ef894263068839782716fece54154effd3d0fe;hpb=1d29a584c8387798fb1558fd54a09b1d8fbe90b7

diff --git a/micropeak/MicroPeak.app/Contents/MacOS/JavaApplicationStub b/micropeak/MicroPeak.app/Contents/MacOS/JavaApplicationStub
index 145a260b..0c36006c 100755
--- a/micropeak/MicroPeak.app/Contents/MacOS/JavaApplicationStub
+++ b/micropeak/MicroPeak.app/Contents/MacOS/JavaApplicationStub
@@ -544,12 +544,32 @@ if [ -z "${JAVACMD}" ] || [ ! -x "${JAVACMD}" ] ; then
 	# find installed JavaVirtualMachines (JDK + JRE)
 	allJVMs=()
 	# read JDK's from '/usr/libexec/java_home -V' command
-	while read -r line; do
-		version=$(echo $line | awk -F $',' '{print $1;}')
-		path=$(echo $line | awk -F $'" ' '{print $2;}')
-		path+="/bin/java"
-		allJVMs+=("$version:$path")
-	done < <(/usr/libexec/java_home -V 2>&1 | grep '^[[:space:]]')
+	case `sw_vers -productVersion` in
+	    10*)
+		# read JDK's from '/usr/libexec/java_home -V' command
+		while read -r line; do
+		    version=$(echo $line | awk -F $',' '{print $1;}')
+		    path=$(echo $line | awk -F $'" ' '{print $2;}')
+		    path+="/bin/java"
+		    allJVMs+=("$version:$path")
+		done < <(/usr/libexec/java_home -V 2>&1 | grep '^[[:space:]]')
+		;;
+	    *)
+		# read JDK's from java_home -X command
+		while read version path; do
+		    path+="/bin/java"
+		    allJVMs+=("$version:$path")
+		done < <(/usr/libexec/java_home -X |
+			     awk '/<dict>/ { version = ""; path = ""; }
+				  /<key>/ { key=$1; sub(/<key>/, "", key); sub(/<\/key>/, "", key); }
+				  /<string>/ { string=$1; sub(/<string>/, "", string); sub(/<\/string>/, "", string);
+						if (key == "JVMHomePath") path = string;
+						if (key == "JVMVersion") version = string;
+					     }
+				  /<\/dict>/ { if (version != "" && path != "") printf("%s %s\n", version, path); }')
+		;;
+	esac
+
 	# unset while loop variables
 	unset version path
 
@@ -566,6 +586,7 @@ if [ -z "${JAVACMD}" ] || [ ! -x "${JAVACMD}" ] ; then
 	# debug output
 	for i in "${allJVMs[@]}"
 	do
+	    echo "found JVM $i"
 		stub_logger "[JavaSearch] ... found JVM: $i"
 	done