Changeset 36420 for main/trunk

Timestamp:

2022-08-22T10:34:56+12:00 (20 months ago)

Author:

davidb

Message:

Tweaks to print statements, and running .sh rather than .bash SETUP files

Location:

main/trunk/greenstone3

Files:

• gs3-check.sh (modified) (3 diffs)
• gs3-setup-cli.sh (added)

main/trunk/greenstone3/gs3-check.sh

@@ -1 +1 @@
 #!/bin/bash
-
-
-
 
 function check_exists {
@@ -16 +13 @@
     echo "  => Found $prog_name executable in PATH"
     else
-    echo "" 1>&2
     echo "****" 1>&2
     echo "* Failed to find '$prog_name'" 1>&2
     echo "*" 1>&2    
-    echo "* => Consider running ext/get-${ext_name}.sh" 1>&2
-    echo "*    and then source its SETUP.bash file" 1>&2
+    echo "* => Consider running ext-cli/get-${ext_name}.sh" 1>&2
+    echo "*    and then source ./gs3-setup-cli.sh" 1>&2
     echo "****" 1>&2
     echo "" 1>&2    
@@ -32 +28 @@
 }
 
-#echo ""
-#echo "===="
-#echo "To run Greenstone3:"
-#echo "----"
+check_exists java  "selfcontained-jdk"
+found_java=1
 
-check_exists java  "selfcontained-jdk"
 check_exists ant   "selfcontained-ant"
-#echo "===="
-#echo ""
-
-#echo "===="
-#echo "To compile up Greenstone3:"
+found_ant=1
 
 check_exists javac "selfcontained-jdk"
+found_javac=1
 
+if [ $? != 0 ] ; then
+    if [ $found_java = 1 ] ; then
+    echo "Having found 'java' but not 'javac' means you can run Greenstone3, but not compile it"
+    fi
+fi
 
-
-# Adapted from:
-#    https://stackoverflow.com/questions/7334754/correct-way-to-check-java-version-from-bash-script
-
-#if type -p java > /dev/null ; then
-#    echo "  => Found java executable in PATH"
-#    _java=java
-#else
-#    echo "" 1>&2
-#    echo "****" 1>&2
-#    echo "* Failed to find 'java'" 1>&2
-#    echo "*" 1>&2    
-#    echo "* => Consider running ext/get-selfcontained-jdk.sh" 1>&2
-#    echo "*    and then source its SETUP.bash file" 1>&2
-#    echo "****" 1>&2
-#    echo "" 1>&2    
-#    echo "Exiting check sequence ..." 1>&2
-#    echo "" 1>&2
-#    exit 1
-#fi
-