Changeset 17733

Timestamp:

2008-11-06T12:27:18+13:00 (15 years ago)

Author:

max

Message:

Give a better hint to search4j depending on the platform it is running in order to increase the success rate.

File:

• gli/trunk/gli.sh (modified) (1 diff)

gli/trunk/gli.sh

@@ -314 +314 @@
 #            exit 1
 #        fi
-    fi
-
-    # Since search4j does not recursively search yet, the hint has been altered for now...
+
+    fi
+
+    # Give search4j a hint to find Java depending on the platform
+    if [ $GSDLOS = "linux"] ; then
     HINT=`cd ..;pwd`/packages/jre
-    javapath=`$SEARCH4J_EXECUTABLE -e -p $HINT -m $MINIMUM_JAVA_VERSION`
+    elif [ $GSDLOS = "darwin"] ; then
+    HINT=/System/Library/Frameworks/JavaVM.framework/Home
+    fi  
+    
+    javapath=`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`
 
     if [ "$?" != "0" ]; then
 
-        OLDVER=`$SEARCH4J_EXECUTABLE -v -p $HINT`
+        OLDVER=`"$SEARCH4J_EXECUTABLE" -v -p "$HINT"`
 
         if [ "$?" = "0" ]; then