Fixed merge mistake in previous commit
[scilab.git] / scilab / bin / scilab
index 986f377..bae0b87 100755 (executable)
@@ -738,7 +738,6 @@ set_macox_specific_path()
             case $macosxMinorVersion in
                 10|11)
                     # Specific libBLAS.dylib & libLAPACK.dylib version for 10.10
-                    # (not used in scilab 5.5.2 yet, though)
                     LD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_10${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
                     DYLD_LIBRARY_PATH=$PATH_TO_SPECIFIC_10_10${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
                     ;;
@@ -763,24 +762,24 @@ dialog_try_or_exit()
 
 fail_macosx_too_old()
 {
-    # Version <= 10.6.4
-    dialog_try_or_exit "This version of Scilab will probably fail on this system ($macosxVersion): Scilab requires 10.6.5 (Snow Leopard) or newer system."
+    dialog_try_or_exit "This version of Scilab will probably fail on this system ($macosxVersion): Scilab requires 10.8.3 (Mountain Lion) or newer system."
 }
 check_macosx_version()
 {
     case $macosxMajorVersion in
         10)
             case $macosxMinorVersion in
-                7|8|9)
-                   # We force to install JRE on Lion and later...
+                9)
+                   # We force to install JRE on Mavericks
                    /usr/libexec/java_home --request > /dev/null
                    ;;
                10|11)
                   # ... but not on Yosemite or El Capitan:
                   # there will be a (better) error at launch
                   ;;
-                6)
-                    if test $macosxBuildVersion -le 4; then
+                8)
+                    if test $macosxBuildVersion -le 3; then
+                        # Version <= 10.8.3
                         fail_macosx_too_old
                     fi
                     ;;