From 13c3389e7a4a21983a7f6ee580c86a6b72498fd3 Mon Sep 17 00:00:00 2001
From: Nathan Baltzell <baltzell@jlab.org>
Date: Mon, 26 Aug 2024 13:09:19 -0400
Subject: [PATCH] use similar path, reduce checks

---
 install-clara | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/install-clara b/install-clara
index 32e8fc3ed..5ed9d25ed 100755
--- a/install-clara
+++ b/install-clara
@@ -81,13 +81,14 @@ do
     esac
 done
 
-# Check requested installation path:
+# Check installation path:
 clara_home="$args"
-[ "${#args[@]}" -lt 1 ] && error "Missing PATH argument"
+[ "${#args[@]}" -lt 1 ] && error "Missing PATH argument."
 [ "${#args[@]}" -gt 1 ] && error "Extra PATH arguments:  ${args[@]:1}"
 [ -e "$clara_home" ]    && error "Installation PATH already exists:  $clara_home"
 mkdir -p $clara_home    || error "Cannot create installation PATH:  $clara_home"
 clara_home=$(cd $clara_home && pwd) && rmdir $clara_home
+echo -e "\nConfigured for a CLARA_HOME installation at:\n\t$clara_home"
 
 # Detect local COATJAVA installation and convert into an absolute path:
 if compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null
@@ -96,25 +97,24 @@ then
     echo -e "\nUsing local COATJAVA installation:\n\t$coatjava"
 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"
+    echo -e "\nWARNING:  COATJAVA doesn't look like a local installation nor version number:  $coatjava"
 fi
 
 # Do everything inside a new, temporary directory:
-[ -w "." ] || error "Current working directory is not writeable:  \$PWD=$PWD"
-tmp_dir=$(mktemp -d tmp.install-clara.XXXXXX)
+tmp_dir=$(mktemp -d $clara_home.tmp.XXXXXX)
 [ $? -ne 0 ] && error "Cannot create temporary directory:  $tmp_dir"
 tmp_dir=$(cd $tmp_dir && pwd)
 echo -e "\nCreating temporary build directory:\n\t$tmp_dir"
 cd $tmp_dir
 
 # CLARA:
-echo -e "\nRetrieving CLARA version $clara ..."
+echo -e "\nRetrieving CLARA/$clara ..."
 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
 then
-    echo -e "\nRetrieving COATJAVA version $coatjava ..."
+    echo -e "\nRetrieving COATJAVA/$coatjava ..."
     get https://clasweb.jlab.org/clas12offline/distribution/coatjava/coatjava-$coatjava.tar.gz
     coatjava=./coatjava
 fi
@@ -122,7 +122,7 @@ mkdir -p clara-cre/plugins/clas12/config
 cp -Lr $coatjava/etc $coatjava/bin $coatjava/lib* clara-cre/plugins/clas12
 
 # GRAPES:
-echo -e "\nRetrieving GRAPES version $grapes ..."
+echo -e "\nRetrieving GRAPES/$grapes ..."
 get https://clasweb.jlab.org/clas12offline/distribution/grapes/grapes-$grapes.tar.gz
 mv grapes-$grapes clara-cre/plugins/grapes
 cp -r clara-cre/plugins/grapes/bin/clara-grapes clara-cre/bin/
@@ -130,7 +130,7 @@ cp -r clara-cre/plugins/grapes/bin/clara-grapes clara-cre/bin/
 # JRE:
 if ! [ -z ${jre+x} ]
 then
-    echo -e "\nRetrieving JRE version $jre ..."
+    echo -e "\nRetrieving JRE/$jre ..."
     mkdir clara-cre/jre
     get https://userweb.jlab.org/~gurjyan/clara-cre/linux-64-$jre.tar.gz clara-cre/jre
 fi