Force JRE 8 at startup for Mac OS X version 86/16886/1
Vincent COUVERT [Thu, 23 Jul 2015 13:11:29 +0000 (15:11 +0200)]
Change-Id: I19015ddd50ab89a0d53df4c5d495d42405bbfaaf

scilab/bin/scilab

index 3024760..3674042 100755 (executable)
@@ -296,7 +296,7 @@ set_macosx_java_vm () {
     # don't need to detect the CPU
     JAVA_SHLIB="libjava.jnilib"
     if test -z "$JAVA_HOME"; then
-      JAVA_HOME=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)
+      JAVA_HOME=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.8+)
     fi
     DYLD_LIBRARY_PATH="$JAVA_HOME/../Libraries${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}"