Changeset 1073 for trunk/script

Timestamp:

06/01/16 22:57:48 (8 years ago)

Author:

davidb

Message:

Added in check for EXPEDITEE_FILESYSTEM

File:

• trunk/script/expeditee (modified) (2 diffs)

trunk/script/expeditee

@@ -115 +115 @@
    custom_vm_args="-Xdock:name=$PROGABBR"
 fi
-    
+
+
+cygwin_detected=0
+cygpath -h 2>/dev/null
+if [ $? == 0 ] ; then
+  cygwin_detected=1
+fi
+
 #"$javapath" -Xmx128M -classpath classes/:GLI.jar:lib/apache.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar $custom_vm_args org.greenstone.gatherer.GathererProg -gsdl "$GSDLHOME" -gsdlos $GSDLOS -gsdl3 "$GSDL3HOME" -gsdl3src "$GSDL3SRCHOME" $*
   
-
 
 jars='jars/JEP.jar:jars/JFreeCharts.jar:jars/activation.jar:jars/cobra.jar:jars/ext:jars/iText-2.1.3.jar:jars/jazzy-core.jar:jars/jcommon-1.0.13.jar:jars/js.jar:jars/lobo-pub.jar:jars/lobo.jar:jars/mail.jar:jars/xercesImpl.jar'
@@ -124 +130 @@
 jars="$jars:releases/Expeditee.jar"
 
-cygpath -h 2>/dev/null
-if [ $? == 0 ] ; then
+if [ $cygwin_detected = "1" ] ; then
   jars=`cygpath -wp "$jars"`
 fi
+
+
+opt_java_props=""
+if [ "x$EXPEDITEE_FILESYSTEM" != "x" ] ; then
+    if [ ! -d "$EXPEDITEE_FILESYSTEM" ] ; then
+        echo "++ Detected explicit Expeditee filesystem setting"
+        echo "++ Creating \"$EXPEDITEE_FILESYSTEM\""
+        echo ""
+        mkdir "$EXPEDITEE_FILESYSTEM"
+        if [ $? != 0 ] ; then
+            echo "Failed to create directory \"$EXPEDITEE_FILESYSTEM\"" >&2
+            exit -1
+        fi
+    fi
+    _expeditee_filesystem=""
+    if [ $cygwin_detected = "1" ] ; then
+        _expeditee_filesystem=`cygpath -ws "$EXPEDITEE_FILESYSTEM" | sed 's/\\\\/\\\\\\\\/g'`
+    else
+        _expeditee_filesystem="$EXPEDITEE_FILESYSTEM"
+    fi
+
+    opt_java_props="-Dexpeditee.home=$_expeditee_filesystem"
+fi
+
+
 
 #java -classpath "$jars"  org.expeditee.gui.Browser $*
 
 cd "$EXPEDITEE_HOME"
-java -classpath releases/Expeditee.jar  org.apollo.ApolloSystem $*
+java $custom_vm_args $opt_java_props -classpath releases/Expeditee.jar org.apollo.ApolloSystem $*