Changeset 36442

Timestamp:

2022-08-22T16:45:11+12:00 (20 months ago)

Author:

davidb

Message:

Evolving script to check-out and prepare packages

Location:

main/trunk/greenstone3/ext-cli

Files:

• get-selfcontained-ant.sh (modified) (2 diffs)
• get-selfcontained-mvn.sh (added)

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

@@ -3 +3 @@
 OS_ALLCAPS=`uname | tr 'a-z' 'A-Z'`
 
+selfcon_ext=selfcontained-ant
+installed_dir=${selfcon_ext}/apache-ant
+
 echo ""
-if [ ! -d selfcontained-ant ] ; then
-    echo "Checking from svn: Greenstone3's selfcontained-ant extension"
-    svn co https://svn.greenstone.org/gs3-extensions/selfcontained-ant/trunk selfcontained-ant
+if [ ! -d $selfcon_ext ] ; then
+    echo "Checking from svn: Greenstone3's $selfcon_ext extension"
+    svn co https://svn.greenstone.org/gs3-extensions/$selfcon_ext/trunk $selfcon_ext
 
     if [ $? != 0 ] ; then
     echo "Error encountered checking out: " 1>&2
-    echo "    svn co https://svn.greenstone.org/gs3-extensions/selfcontained-ant/trunk selfcontained-ant" 1>&2
+    echo "    svn co https://svn.greenstone.org/gs3-extensions/$selfcon_ext/trunk $selfcon_ext" 1>&2
     exit 1
     fi
 else
-    echo "Detected directory 'selfcontained-ant'"
+    echo "Detected directory '$selfcon_ext'"
     echo "=> Taken to mean that the svn check-out command has already been run"
 fi
 
 echo ""
-if [ ! -d selfcontained-ant/apache-ant ] ; then
-    echo "Runing the selfcontained-ant/PREPARE-${OS_ALLCAPS}.sh"
+if [ ! -d $installed_dir ] ; then
+    echo "Runing the $selfcon_ext/PREPARE-${OS_ALLCAPS}.sh"
 
-    cd selfcontained-ant && ./PREPARE-${OS_ALLCAPS}.sh
+    cd $selfcon_ext && ./PREPARE-${OS_ALLCAPS}.sh
 
     if [ $? != 0 ] ; then
     echo "Error encountered running: " 1>&2
-    echo "        cd selfcontained-ant && ./PREPARE-${OS_ALLCAPS}.sh" 1>&2
+    echo "        cd $selfcon_ext && ./PREPARE-${OS_ALLCAPS}.sh" 1>&2
     exit 1
     fi
     
 else
-    echo "Detected directory 'selfcontained-ant/apache-ant'"
-    echo "=> Taken to mean that the selfcontained-ant/PREPARE-${OS_ALLCAPS}.sh command has already been run"    
+    echo "Detected directory '$installed_dir'"
+    echo "=> Taken to mean that the $selfcon_ext/PREPARE-${OS_ALLCAPS}.sh command has already been run"    
 fi
 
 
-if [ "x$JAVA_HOME" != "x$PWD/selfcontained-ant/apache-ant" ] ; then
+if [ "x$ANT_HOME" != "x$PWD/$installed_dir" ] ; then
     echo ""
     echo "To use this installed version of Apache Ant, in the top-level Greenstone3 directory run:"
@@ -43 +46 @@
 else
     echo ""
-    echo "Detected JAVA_HOME set to \$PWD/selfcontained-ant/apache-ant"
-    echo "=> Taken to mean that the selfcontained-ant SETUP.sh file has been sourced"
+    echo "Detected ANT_HOME set to \$PWD/$installed_dir"
+    echo "=> Taken to mean that the $selfcon_ext SETUP.sh file has been sourced"
 fi