Changeset 36649


Ignore:
Timestamp:
2022-09-22T10:42:17+12:00 (12 days 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:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/ext-cli/get-selfcontained-ant.sh

    r36570 r36649  
    55selfcon_ext=selfcontained-ant
    66installed_dir=${selfcon_ext}/apache-ant
     7
     8if [ ! -d selfcontained-jdk ] ; then
     9    echo ""
     10    echo "Checking for java ..."
     11    command -v java
     12
     13    if [ $? != 0 ] ; then
     14    echo ""
     15    echo "Failed to find 'java'"
     16    echo "After 5 seconds, initiating: "
     17    echo ""
     18    echo "    ./get-selfcontained-jdk.sh"
     19    echo "[Press ^C to stop]"
     20    sleep 5
     21    ./get-selfcontained-jdk.sh
     22    else
     23    echo ""
     24    echo "Detected 'java' but it is not the Greenstone3 supplied 'selfcontained-jdk'"
     25    echo "=> Recommend running:"
     26    echo ""
     27    echo "    ./get-selfcontained-jdk.sh"
     28    echo ""
     29    echo "After 5 seconds, continuing with getting ant"
     30    echo "[Press ^C to stop]"
     31    sleep 5
     32    fi
     33fi
    734
    835echo ""
  • main/trunk/greenstone3/ext-cli/get-selfcontained-jdk.sh

    r36570 r36649  
    4141if [ "x$JAVA_HOME" != "x$PWD/$installed_dir" ] ; then
    4242    echo ""
    43     echo "To use this installed version of Apache Ant, in the top-level Greenstone3 directory run:"
     43    echo "To use this installed version of JDK, in the top-level Greenstone3 directory run:"
    4444    echo "    source ./gs3-setup-cli.sh"
    4545    echo ""
Note: See TracChangeset for help on using the changeset viewer.