From d273a5377d23029752742dc24ed569c3213bc241 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 28 Sep 2026 14:00:33 -0400 Subject: [PATCH 1/2] remove clara tarball option --- .github/workflows/ci.yml | 4 ++-- bin/install-clara | 15 ++++----------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65f3be805d..0c32b30722 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: - name: build run: | ./build-coatjava.sh --lfs --no-progress -T${{ env.nthreads }} - ./bin/install-clara -b -c ./coatjava ./clara + ./bin/install-clara -c ./coatjava ./clara - name: tar # tarball to preserve permissions run: | tar czvf coatjava.tar.gz coatjava @@ -102,7 +102,7 @@ jobs: - name: build run: | ./build-coatjava.sh --lfs --no-progress -T${{ env.nthreads }} - ./bin/install-clara -b -c ./coatjava ./clara + ./bin/install-clara -c ./coatjava ./clara - name: tar # tarball to preserve permissions run: | tar czvf coatjava.tar.gz coatjava diff --git a/bin/install-clara b/bin/install-clara index d510db20f3..5c00f3d395 100755 --- a/bin/install-clara +++ b/bin/install-clara @@ -71,13 +71,12 @@ trap cleanup EXIT # Configure: debug=0 args=() -usage="Usage: install-clara [-v] [-b] [-c COATJAVA] [-f CLARA] [-g GRAPES] PATH" +usage="Usage: install-clara [-v] [-c COATJAVA] [-f CLARA] [-g GRAPES] PATH" info=""" - The default CLARA / GRAPES versions are $clara / $grapes - COATJAVA can also be specified as a local installation directory - If the COATJAVA version is not specified, it will try to auto-detect it. -- [-v adds verbosity and disables cleanup] -- [-b builds clara from source]""" +- [-v adds verbosity and disables cleanup]""" while [[ $# -gt 0 ]] do @@ -126,14 +125,8 @@ tmp_dir=$(cd $tmp_dir && pwd) cd $tmp_dir # CLARA: -if ! [ -z ${build+x} ] -then - echo -e "\nBuilding CLARA from source ..." - build_clara $PWD/clara-cre -else - echo -e "\nRetrieving CLARA version $clara ..." - get https://clasweb.jlab.org/clas12offline/distribution/clara/clara-cre-$clara.tar.gz -fi +echo -e "\nBuilding CLARA from source ..." +build_clara $PWD/clara-cre # COATJAVA: if ! compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null From a0195f8fd281fc80de04532d4c4412e1a7635744 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 29 Sep 2026 11:16:54 -0400 Subject: [PATCH 2/2] really remove the -b option --- bin/install-clara | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/install-clara b/bin/install-clara index 5c00f3d395..48b3ffb44e 100755 --- a/bin/install-clara +++ b/bin/install-clara @@ -85,7 +85,6 @@ do -f) clara="$2" && shift && shift ;; -c) coatjava="$2" && shift && shift ;; -g) grapes="$2" && shift && shift ;; - -b) build=1 && shift ;; -v) let debug=$debug+1 && shift ;; -*|--*) echo -e "$usage\n\nUnknown option: $1" && exit 1 ;; *) args+=("$1") && shift ;;