New tarball location, cleanup installer script (JeffersonLab#242)

baltzell · Nathan Baltzell · web-flow · commit 73e05774d0fe · 2024-04-03T17:52:45.000-04:00
* cleanup

* switch to new clara tarball location

* stop selective copy

* switch to temporary version for now

* fix warning message

---------

Co-authored-by: Nathan Baltzell &lt;baltzell@baltzellmac.jlab.org&gt;
diff --git a/build-coatjava.sh b/build-coatjava.sh
@@ -92,13 +92,12 @@ cp -r etc coatjava/
 which python3 >& /dev/null && python=python3 || python=python
 $python etc/bankdefs/util/bankSplit.py coatjava/etc/bankdefs/hipo4 || exit 1
 mkdir -p coatjava/lib/clas
-#cp external-dependencies/JEventViewer-1.1.jar coatjava/lib/clas/
-#cp external-dependencies/vecmath-1.3.1-2.jar coatjava/lib/clas/
 mkdir -p coatjava/lib/utils
-cp external-dependencies/jclara-4.3-SNAPSHOT.jar coatjava/lib/utils
-#cp external-dependencies/jaw-1.0.jar coatjava/lib/utils
 mkdir -p coatjava/lib/services
 
+# FIXME:  this is still needed by one of the tests
+cp external-dependencies/jclara-4.3-SNAPSHOT.jar coatjava/lib/utils
+
 ### clean up any cache copies ###
 cd common-tools/coat-lib; $mvn clean; cd -
 
diff --git a/install-clara b/install-clara
@@ -2,7 +2,7 @@
 
 # Default versions:
 grapes=2.17
-clara=5.0.2
+clara=v0
 coatjava=10.0.8
 
 # Abort on any non-zero exit codes:
@@ -94,7 +94,7 @@ if compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null
 then
     coatjava=$(cd $coatjava && pwd)
     echo -e "\nUsing local COATJAVA installation:\n\t$coatjava"
-elif ! [[ "$coatjava" =~ ^[0-9]+\.[0-9]\.[0-9]$ ]]
+elif ! [[ "$coatjava" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]
 then
     echo -e "\n\nWARNING:  COATJAVA doesn't look like a local installation nor version number:  $coatjava"
 fi
@@ -109,7 +109,7 @@ cd $tmp_dir
 
 # CLARA:
 echo -e "\nRetrieving CLARA version $clara ..."
-get https://userweb.jlab.org/~gurjyan/clara-cre/clara-cre-$clara.tar.gz
+get https://clasweb.jlab.org/clas12offline/distribution/clara/clara-cre-$clara.tar.gz
 
 # COATJAVA:
 if ! compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null
@@ -118,14 +118,8 @@ then
     get https://clasweb.jlab.org/clas12offline/distribution/coatjava/coatjava-$coatjava.tar.gz
     coatjava=./coatjava
 fi
-mkdir -p clara-cre/plugins/clas12/lib/clas
-mkdir -p clara-cre/plugins/clas12/lib/services
 mkdir -p clara-cre/plugins/clas12/config
-cp -Lr $coatjava/etc clara-cre/plugins/clas12/.
-cp -Lr $coatjava/bin clara-cre/plugins/clas12/.
-cp -Lr $coatjava/lib/utils clara-cre/plugins/clas12/lib/.
-cp -Lr $coatjava/lib/clas/* clara-cre/plugins/clas12/lib/clas/.
-cp -Lr $coatjava/lib/services/* clara-cre/plugins/clas12/lib/services/.
+cp -Lr $coatjava/etc $coatjava/bin $coatjava/lib clara-cre/plugins/clas12
 
 # GRAPES:
 echo -e "\nRetrieving GRAPES version $grapes ..."
