Changeset 36649 for main

Timestamp:

2022-09-22T10:42:17+12:00 (19 months ago)

Author:

davidb

Message:

Ant script now includes 'breadcrumbs' for JDK, as this is needed to run ant; other text tidy up

Location:

main/trunk/greenstone3/ext-cli

Files:

• get-selfcontained-ant.sh (modified) (1 diff)
• get-selfcontained-jdk.sh (modified) (1 diff)

main/trunk/greenstone3/ext-cli/get-selfcontained-ant.sh

@@ -5 +5 @@
 selfcon_ext=selfcontained-ant
 installed_dir=${selfcon_ext}/apache-ant
+
+if [ ! -d selfcontained-jdk ] ; then
+    echo ""
+    echo "Checking for java ..."
+    command -v java 
+
+    if [ $? != 0 ] ; then
+    echo ""
+    echo "Failed to find 'java'"
+    echo "After 5 seconds, initiating: "
+    echo ""
+    echo "    ./get-selfcontained-jdk.sh"
+    echo "[Press ^C to stop]"
+    sleep 5
+    ./get-selfcontained-jdk.sh
+    else
+    echo ""
+    echo "Detected 'java' but it is not the Greenstone3 supplied 'selfcontained-jdk'"
+    echo "=> Recommend running:"
+    echo ""
+    echo "    ./get-selfcontained-jdk.sh"
+    echo ""
+    echo "After 5 seconds, continuing with getting ant"
+    echo "[Press ^C to stop]"
+    sleep 5
+    fi
+fi
 
 echo ""

main/trunk/greenstone3/ext-cli/get-selfcontained-jdk.sh

@@ -41 +41 @@
 if [ "x$JAVA_HOME" != "x$PWD/$installed_dir" ] ; then
     echo ""
-    echo "To use this installed version of Apache Ant, in the top-level Greenstone3 directory run:"
+    echo "To use this installed version of JDK, in the top-level Greenstone3 directory run:"
     echo "    source ./gs3-setup-cli.sh"
     echo ""