Changeset 36055 for main

Timestamp:

2022-02-08T14:02:46+13:00 (2 years ago)

Author:

kjdon

Message:

copied a couple things from gli.sh - make sure we are running from the correct directory, and run findgsdl.sh, which sources gs3-setup.sh. Had to change from sh to bash, as source was not recognised. This was prompted by me trying to recompile gli on my machine which has java 11 as default, but I have set JAVA_HOME to be 1.8 in local/gs3-setup.sh. so makegli used 11, the gli used 8, and of course it wouldn't run.

File:

• main/trunk/gli/makegli.sh (modified) (2 diffs)

main/trunk/gli/makegli.sh

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
+
 glilang=en
 
+# Need to run this script from its own directory instead of whichever directory it may be called from
+#currentdir=$(cd `dirname "$0"` && pwd)
+thisdir="`dirname \"$0\"`"
+thisdir="`cd \"$thisdir\" && pwd`"
+cd "$thisdir"
 
 # Don't bother compiling GLI if there's no source code (e.g. if this is a binary only)
@@ -35 +41 @@
 
 ##  -------- Compile the Greenstone Librarian Interface --------
+
+##  ---- Determine GSDLHOME ----
+# we want to have the same environment (eg JAVA_HOME set in local folder) as the runtime does.
+
+# need to source a script in order to inherit the env vars it has set
+# Exit on error code (non-zero)
+exit_status=0
+source ./findgsdl.sh
+exit_status=$?
+if [ "$exit_status" -eq 1 ]; then
+    exit 1;
+fi
 
 ## ---- Check Javac exists ----