fix!: env.sh sourceable should not be in $PATH

bin/bg-merger

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/bos2hipo

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m -XX:+UseSerialGC \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \

bin/cvt-compare

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/daqEventViewer

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \

bin/dclayereffs-ana

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Dsun.java2d.pmoffscreen=false -Xmx2048m -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/utils/*:$CLAS12DIR/lib/services/*" \

bin/decoder

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/dict-generator

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/dict-maker

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/dict-merger

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/dict-validator

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/evio-viewer

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -cp "$CLAS12DIR/lib/clas/*" org.jlab.coda.eventViewer.EventTreeFrame $*

bin/evio2hipo

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/eviocure

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/eviodump

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \

bin/hipo-add

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \

bin/hipo-browser

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \

bin/hipo-diff

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/hipo-json

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
     -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \

bin/hipo-utils

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/postprocess

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/rebuild-scalers

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/recon-util

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/run-groovy

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh groovy
+. `dirname $0`/../libexec/env.sh groovy
 
 echo """
 ****************************************

bin/run-groovysh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh groovy
+. `dirname $0`/../libexec/env.sh groovy
 
 echo """
 ***************************************

bin/run-jshell

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh jshell
+. `dirname $0`/../libexec/env.sh jshell
 
 echo """
 *********************************

bin/trigger-filter

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

bin/trigger-splitter

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. `dirname $0`/env.sh 
+. `dirname $0`/../libexec/env.sh
 
 export MALLOC_ARENA_MAX=1
 

build-coatjava.sh

@@ -61,9 +61,9 @@ download () {
 }
 
 
-# download the default field maps, as defined in bin/env.sh:
+# download the default field maps, as defined in libexec/env.sh:
 # (and duplicated in etc/services/reconstruction.yaml):
-source `dirname $0`/bin/env.sh
+source `dirname $0`/libexec/env.sh
 if [ $downloadMaps == "yes" ]; then
   echo 'Retrieving field maps ...'
   webDir=https://clasweb.jlab.org/clas12offline/magfield
@@ -87,6 +87,7 @@ rm -rf coatjava
 mkdir -p coatjava
 cp -r bin coatjava/
 cp -r etc coatjava/
+cp -r libexec coatjava/
 
 # create schema directories for partial reconstruction outputs
 which python3 >& /dev/null && python=python3 || python=python

install-clara

@@ -119,7 +119,7 @@ then
     coatjava=./coatjava
 fi
 mkdir -p clara-cre/plugins/clas12/config
-cp -Lr $coatjava/etc $coatjava/bin $coatjava/lib clara-cre/plugins/clas12
+cp -Lr $coatjava/etc $coatjava/bin $coatjava/lib* clara-cre/plugins/clas12
 
 # GRAPES:
 echo -e "\nRetrieving GRAPES version $grapes ..."

validation/advanced-tests/run-advanced-tests.sh

@@ -1,51 +1,22 @@
 #!/bin/sh -f
 
+# this test needs rewritten, with more useful data (not KPP),
+# meanwhile not worth maintaining ...
+#exit 0
+
 # coatjava must already be built at ../../coatjava/
-OS=$(uname)
 
 # set up environment
 CLARA_HOME=$PWD/clara_installation/ ; export CLARA_HOME
 COAT=$CLARA_HOME/plugins/clas12/
 classPath="$COAT/lib/services/*:$COAT/lib/clas/*:$COAT/lib/utils/*:../lib/*:src/"
 
-# tar the local coatjava build so it can be installed with clara
-cd ../..
-tar -zcvf coatjava-local.tar.gz coatjava
-mv coatjava-local.tar.gz validation/advanced-tests/
-cd -
-
 # install clara
-
-case $OS in
-    'Linux')
-       wget --no-check-certificate https://claraweb.jlab.org/clara/_downloads/install-claracre-clas.sh
-     ;;
-     'Darwin')
-       echo "Getting Clara..."
-       curl -OL "https://claraweb.jlab.org/clara/_downloads/install-claracre-clas.sh" -o install-claracre-clas.sh
-     ;;
-     *) ;;
-esac
-
-
-chmod +x install-claracre-clas.sh
-echo Y | ./install-claracre-clas.sh -f 5.0.2 -j 11 -l local
+../../install-clara -c ../../coatjava $CLARA_HOME
 if [ $? != 0 ] ; then echo "clara installation error" ; exit 1 ; fi
-rm install-claracre-clas.sh
 
 # download test files
-
-case $OS in
-    'Linux')
-       wget --no-check-certificate http://clasweb.jlab.org/clas12offline/distribution/coatjava/validation_files/twoTrackEvents_809_raw.evio.tar.gz
-     ;;
-     'Darwin')
-       curl -OL "http://clasweb.jlab.org/clas12offline/distribution/coatjava/validation_files/twoTrackEvents_809_raw.evio.tar.gz" -o twoTrackEvents_809_raw.evio.tar.gz
-     ;;
-     *) ;;
-esac
-
-
+wget --no-check-certificate http://clasweb.jlab.org/clas12offline/distribution/coatjava/validation_files/twoTrackEvents_809_raw.evio.tar.gz
 
 if [ $? != 0 ] ; then echo "wget validation files failure" ; exit 1 ; fi
 tar -zxvf twoTrackEvents_809_raw.evio.tar.gz
@@ -64,7 +35,7 @@ echo "set session s_cook" >> cook.clara
 echo "set description d_cook" >> cook.clara
 ls twoTrackEvents_809.hipo > files.list
 echo "set fileList $PWD/files.list" >> cook.clara
-echo "set servicesFile $CLARA_HOME/plugins/clas12/config/kpp.yaml" >> cook.clara
+echo "set servicesFile $COAT/etc/services/kpp.yaml" >> cook.clara
 echo "run local" >> cook.clara
 echo "exit" >> cook.clara
 $CLARA_HOME/bin/clara-shell cook.clara

validation/advanced-tests/run-eb-tests.sh

@@ -87,7 +87,7 @@ esac
 if [ $useClara -eq 0 ]
 then
     COAT=../../coatjava
-    source $COAT/bin/env.sh
+    source $COAT/libexec/env.sh
 else
     CLARA_HOME=$PWD/clara_installation/
     COAT=$CLARA_HOME/plugins/clas12/
@@ -117,11 +117,7 @@ then
         # install clara
         if ! [ -d clara_installation ]
         then
-            wget --no-check-certificate https://claraweb.jlab.org/clara/_downloads/install-claracre-clas.sh
-            chmod +x install-claracre-clas.sh
-            ./install-claracre-clas.sh -l local
-            if [ $? != 0 ] ; then echo "clara installation error" ; exit 1 ; fi
-            rm install-claracre-clas.sh
+            ../../install-clara clara_installation
         fi
     fi