Changeset 18559 for greenstone3

Timestamp:

2009-02-20T13:22:34+13:00 (15 years ago)

Author:

davidb

Message:

Now that we have Server2.java and Server3.java, updated to call the latter

File:

• greenstone3/trunk/gs3-server.sh (modified) (4 diffs)

greenstone3/trunk/gs3-server.sh

@@ -4 +4 @@
 java_min_version=1.4.0_00
 
+autoset_gsdl_home() {
+
+  # remove leading ./ if present
+  prog=${0#./}
+
+  isrelative=${prog%%/*}
+
+  if [ ! -z $isrelative ] ; then
+    # some text is left after stripping
+    # => is relative
+    pwd=$PWD
+    prog="$pwd/$prog"
+  fi
+
+  fulldir=${prog%/*}
+
+  # remove trailing /. if present
+  eval $1=${fulldir%/.}
+}
+
+
 echo "Greenstone 3 Server"
-echo "Copyright (C) 2006, New Zealand Digital Library Project, University Of Waikato"
+echo "Copyright (C) 2009, New Zealand Digital Library Project, University Of Waikato"
 echo "This software comes with ABSOLUTELY NO WARRANTY; for details see LICENSE.txt"
 echo "This is free software, and you are welcome to redistribute it"
@@ -11 +32 @@
 ##  -------- Run the Greenstone 3 Server --------
 
-# This script must be run from within the directory in which it lives
-thisdir=`pwd`
-if [ ! -f "${thisdir}/gs3-server.sh" ]; then
-    echo "This script must be run from the directory in which it resides."
-    exit 1
-fi
 
 ##  ---- Determine GSDL3SRCHOME ----
@@ -23 +38 @@
 # Some users may set the above line manually
 if [ -z "$gsdl3path" ]; then
-   gsdl3path=`pwd`  
+   autoset_gsdl_home gsdl3path
 fi
 
@@ -37 +52 @@
 search4j -m $java_min_version &> /dev/null
 if [ "$?" == "0" ]; then
-    `search4j -m $java_min_version -e` org.greenstone.server.Server $GSDL3SRCHOME 
+    # In Java code, '...getResourceAsStream("build.properties")'
+    # needs up to be in the right directory when run
+    pushd $gsdl3path > /dev/null
+
+    javapath=`search4j -m $java_min_version -e` 
+    $javapath org.greenstone.server.Server3 $GSDL3SRCHOME $serverlang
+
+    popd > /dev/null
 fi