Changeset 36416 for main/trunk

Timestamp:

2022-08-22T00:32:09+12:00 (20 months ago)

Author:

davidb

Message:

Further script development

File:

• main/trunk/greenstone3/gs3-check.sh (modified) (2 diffs)

main/trunk/greenstone3/gs3-check.sh

@@ -2 +2 @@
 
 
-echo ""
-echo "Checking for 'java'"
+
+
+function check_exists {
+    local prog_name=$1
+    local ext_name=$2
+
+    local status=0
+
+    echo ""
+    echo "Checking for '$prog_name'"
+
+    if type -p $prog_name > /dev/null ; then
+    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 "****" 1>&2
+    echo "" 1>&2    
+#   echo "Exiting check sequence ..." 1>&2
+#   echo "" 1>&2
+    status=1
+    fi
+
+    return $status
+}
+
+#echo ""
+#echo "===="
+#echo "To run Greenstone3:"
+#echo "----"
+
+check_exists java  "selfcontained-jdk"
+check_exists ant   "selfcontained-ant"
+#echo "===="
+#echo ""
+
+#echo "===="
+#echo "To compile up Greenstone3:"
+
+check_exists javac "selfcontained-jdk"
+
 
 
@@ -9 +52 @@
 #    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
 
-if type -p java > /dev/null ; then
-    echo "  => Found java executable in PATH"
-    _java=java
-#elif [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]];  then
-#    echo found java executable in JAVA_HOME     
-#    _java="$JAVA_HOME/bin/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
-
-# java_min_version="1.8"
-
-
-#if [[ "$_java" ]]; then
-#    version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}')
-#    echo "  Java version: $version"
-#    if [[ "$version" < "$java_min_version" ]]; then
-#   echo ""
-#   echo "****"
-#   echo "* Java check failed!"
-#   echo "* Minimum version of Java needed nfor Greenstone3: v$java_min_version"
-#   echo "****"
-#   echo ""
-#   exit 1
-#    fi
-#fi