From af3b864e7e58c5f50455077d526537343ada32d9 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Tue, 19 Sep 2023 16:25:52 -0400 Subject: [PATCH] test: desparate `echo`s --- bin/env.sh | 14 +++++--------- bin/run-groovy | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/bin/env.sh b/bin/env.sh index 7c8f6e0a09..79a8e69451 100644 --- a/bin/env.sh +++ b/bin/env.sh @@ -1,16 +1,8 @@ #!/bin/sh -thisEnv=${BASH_SOURCE[0]:-$0} -export CLAS12DIR=$(realpath $(dirname $thisEnv)/..) - - - - +export CLAS12DIR=$(realpath $(dirname $0)/..) echo "CLAS12DIR = $CLAS12DIR" - - - # Set default field maps (but do not override user's env): if [ -z "$COAT_MAGFIELD_TORUSMAP" ]; then export COAT_MAGFIELD_TORUSMAP=Symm_torus_r2501_phi16_z251_24Apr2018.dat @@ -24,8 +16,11 @@ fi # additional environment variables for groovy or interactive use # - call as `source $0 groovy` or `source $0 jshell` +echo "1 = $1" if [ $# -ge 1 ]; then + echo "CALLED WITH $1" if [ "$1" = "groovy" -o "$1" = "jshell" ]; then + echo "HERE 1" # add jar files to class path for lib in clas services utils; do @@ -36,6 +31,7 @@ if [ $# -ge 1 ]; then # additional variables and settings for groovy if [ "$1" = "groovy" ]; then + echo "HERE 2" JYPATH="${JYPATH:+${JYPATH}:}${CLAS12DIR}/lib/packages" export JAVA_OPTS="-Dsun.java2d.pmoffscreen=false -Djava.util.logging.config.file=$CLAS12DIR/etc/logging/debug.properties -Xms1024m -Xmx2048m -XX:+UseSerialGC" fi diff --git a/bin/run-groovy b/bin/run-groovy index a39a3b853a..c08edddeb6 100755 --- a/bin/run-groovy +++ b/bin/run-groovy @@ -1,6 +1,6 @@ #!/bin/sh -source `dirname $0`/env.sh groovy +. `dirname $0`/env.sh groovy echo """ ****************************************