From 1be30d11242db021b55ab49b6eb1e4e36c92d509 Mon Sep 17 00:00:00 2001
From: Nathan Baltzell <baltzell@jlab.org>
Date: Fri, 10 Oct 2025 18:05:56 -0400
Subject: [PATCH] install clara from coatjava build script

---
 build-coatjava.sh | 9 ++++++++-
 install-clara     | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build-coatjava.sh b/build-coatjava.sh
index 9b04f4aec..22559520f 100755
--- a/build-coatjava.sh
+++ b/build-coatjava.sh
@@ -24,6 +24,8 @@ usage='''build-coatjava.sh [OPTIONS]... [MAVEN_OPTIONS]...
    --xrootd          use xrootd to download field maps
    --cvmfs           use cvmfs to download field maps
 
+   --clara           install clara too
+
    --help            show this message
 
   MAVEN_OPTIONS
@@ -38,6 +40,7 @@ downloadMaps="yes"
 runUnitTests="no"
 useXrootd=false
 useCvmfs=false
+installClara=false
 mvnArgs=()
 wgetArgs=()
 for xx in $@
@@ -59,6 +62,7 @@ do
       ;;
     --xrootd) useXrootd=true ;;
     --cvmfs) useCvmfs=true ;;
+    --clara) installClara=true ;;
     -h|--help)
       echo "$usage"
       exit 2
@@ -69,6 +73,7 @@ done
 
 src_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
 prefix_dir=$src_dir/coatjava
+clara_home=$src_dir/clara
 
 # working directory should be the source code directory
 cd $src_dir
@@ -129,7 +134,7 @@ if [ $cleanBuild == "no" ] && [ $downloadMaps == "yes" ]; then
 fi
 
 # always clean the installation prefix
-rm -rf $prefix_dir
+rm -rf $prefix_dir $clara_home
 
 # clean up any cache copies
 if [ $cleanBuild == "yes" ]; then
@@ -210,4 +215,6 @@ for pom in $(find common-tools -name pom.xml); do
 done
 echo "installed coatjava to: $prefix_dir"
 
+if $installClara; then ./install-clara -c $prefix_dir $clara_home; fi
+
 echo "COATJAVA SUCCESSFULLY BUILT !"
diff --git a/install-clara b/install-clara
index 640d8f0e3..e5baec09d 100755
--- a/install-clara
+++ b/install-clara
@@ -42,7 +42,7 @@ function litter() {
 function check() {
     if compgen -G "$clara_home/lib/jclara-*.jar" > /dev/null
     then
-        echo -e "\n\$CLARA_HOME installed at:\n\t$clara_home"
+        echo -e "\n\$CLARA_HOME installed at:\n\t$clara_home\n"
     else
         echo -e "\n\$CLARA_HOME installed but looks broken:\n\t$clara_home"
     fi