diff --git a/scilab/bin/scilab b/scilab/bin/scilab index 67f6474..7a4f6f5 100755 --- a/scilab/bin/scilab +++ b/scilab/bin/scilab @@ -355,7 +355,7 @@ detect_java_vm() { # uname -m Darwin # If the user has the variable JAVA_HOME in the ENV - if test -n "$JAVA_HOME" ; then + if test -n "$JAVA_HOME" ; then if test $SCIVERBOSE -ne 0; then echo "Using specified vm: $JAVA_HOME" fi @@ -363,7 +363,7 @@ detect_java_vm() { echo "Cannot find $JAVA_HOME/bin/java" exit 1 fi - fi + else case $OS in *darwin* | *Darwin*) @@ -429,18 +429,17 @@ detect_java_vm() { done IFS=$as_save_IFS fi + fi if test ! -z "$JAVA_HOME"; then if test $SCIVERBOSE -ne 0; then echo "JAVA_HOME : $JAVA_HOME" fi - # Manage JRE & JDK because libjava.so and others are stored in the JRE if test -d $JAVA_HOME/jre; then JRE_HOME=$JAVA_HOME/jre else JRE_HOME=$JAVA_HOME fi - # Configuring LD_LIBRARY_PATH for libjava.so libhpi.so and libxxxx.so case $OS in