Changeset 17670 for gli

Timestamp:

2008-11-04T13:38:08+13:00 (15 years ago)

Author:

max

Message:

Solve some problems that were occuring on Ubuntu, and add a temporary fix to search4j which is not working as expected for now.

File:

• gli/trunk/gli.sh (modified) (5 diffs)

gli/trunk/gli.sh

@@ -176 +176 @@
     if [ "x$GSDLHOME" = "x" ]; then
     cd "$gsdlpath"
-    . setup.bash
+    . ./setup.bash
     cd "$thisdir"
     fi
@@ -184 +184 @@
     if [ "x$GSDL3HOME" = "x" -o "x$GSDL3SRCHOME" = "x" ]; then
     cd "$gsdlpath"
-    . gs3-setup.sh
+    . ./gs3-setup.sh
     cd "$thisdir"
     fi
@@ -211 +211 @@
     if [ "x$GSDLHOME" = "x" ]; then
     cd "$gsdl2path"
-    . setup.bash
+    . ./setup.bash
     cd "$thisdir"
     fi
@@ -275 +275 @@
 
 # Some users may set this line manually
-javapath=
-
-if [ "$javapath" = "" ]; then
+javapath=""
+
+if [ -z $javapath ]; then
 
     # sus out search4j
-    if [ "$_version" -eq 2 -a -x "$GSDLHOME/bin/$GSDLOS/search4j" ]; then
+    if [ "$_version" -eq 2 -a -e "$GSDLHOME/bin/$GSDLOS/search4j" ]; then
         SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j
-    elif [ "$_version" -eq 3 -a -x "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then
+    elif [ "$_version" -eq 3 -a -e "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then
         SEARCH4J_EXECUTABLE=$GSDL3SRCHOME/bin/search4j
-    elif [ -x "../bin/$GSDLOS/search4j" ]; then
+    elif [ -e "../bin/$GSDLOS/search4j" ]; then
         SEARCH4J_EXECUTABLE=../bin/$GSDLOS/search4j
-    elif [ -x "../bin/search4j" ]; then
+    elif [ -e "../bin/search4j" ]; then
         SEARCH4J_EXECUTABLE=../bin/search4j
     else
@@ -301 +301 @@
 
         # last-resort tricks
-        if [ -e "../packages/jre" ]; then
-            function search4j_shell_function() {
-              echo `cd ../packages/jre/bin; pwd`/java
-            }
-            SEARCH4J_EXECUTABLE=search4j_shell_function
-        elif [ "$JAVA_HOME" != "" ]; then
-            function search4j_shell_function() {
-              echo $JAVA_HOME/bin/java
-            }
-            SEARCH4J_EXECUTABLE=search4j_shell_function
-        else
-            exit 1
-        fi
-    fi
-
-    HINT=`cd ..;pwd`
+#        if [ -e "../packages/jre" ]; then
+#            function search4j_shell_function() {
+#              echo `cd ../packages/jre/bin; pwd`/java
+#            }
+#            SEARCH4J_EXECUTABLE=search4j_shell_function
+#        elif [ "$JAVA_HOME" != "" ]; then
+#            function search4j_shell_function() {
+#              echo $JAVA_HOME/bin/java
+#            }
+#            SEARCH4J_EXECUTABLE=search4j_shell_function
+#        else
+#            exit 1
+#        fi
+    fi
+
+    # Since search4j does not recursively search yet, the hint has been altered for now...
+    HINT=`cd ..;pwd`/packages/jre
     javapath=`$SEARCH4J_EXECUTABLE -e -p $HINT -m $MINIMUM_JAVA_VERSION`