From 307a1a891214d072f199ee751a5cebf1e400f1f9 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 22 Dec 2025 16:45:16 -0500 Subject: [PATCH] move install-clara to bin/$PATH --- .containers/coatjava.Dockerfile | 2 +- .github/workflows/ci.yml | 2 +- install-clara => bin/install-clara | 0 build-coatjava.sh | 2 +- validation/advanced-tests/run-eb-tests.sh | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename install-clara => bin/install-clara (100%) diff --git a/.containers/coatjava.Dockerfile b/.containers/coatjava.Dockerfile index 513e16c0a1..869c51c089 100644 --- a/.containers/coatjava.Dockerfile +++ b/.containers/coatjava.Dockerfile @@ -23,4 +23,4 @@ ARG REF_NAME=development RUN java --version && cd /opt && \ git clone https://code.jlab.org/hallb/alert/coatjava.git && cd coatjava && \ git fetch origin && git checkout ${REF_NAME} && ./build-coatjava.sh --quiet && \ - ./install-clara /opt/clara + ./bin/install-clara /opt/clara diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e52f436a3..16c02be1e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,7 +88,7 @@ jobs: - name: build run: | ./build-coatjava.sh --lfs --no-progress -T${{ env.nthreads }} - ./install-clara -b -c ./coatjava ./clara + ./bin/install-clara -b -c ./coatjava ./clara - name: tar # tarball to preserve permissions run: | tar czvf coatjava.tar.gz coatjava diff --git a/install-clara b/bin/install-clara similarity index 100% rename from install-clara rename to bin/install-clara diff --git a/build-coatjava.sh b/build-coatjava.sh index 914a1fd58f..b0f1f34017 100755 --- a/build-coatjava.sh +++ b/build-coatjava.sh @@ -368,6 +368,6 @@ done echo "installed coatjava to: $prefix_dir" # install clara -if $installClara; then ./install-clara -c $prefix_dir $clara_home; fi +if $installClara; then ./bin/install-clara -c $prefix_dir $clara_home; fi echo "COATJAVA SUCCESSFULLY BUILT !" diff --git a/validation/advanced-tests/run-eb-tests.sh b/validation/advanced-tests/run-eb-tests.sh index 43ca6e6ed4..9e64ae900b 100755 --- a/validation/advanced-tests/run-eb-tests.sh +++ b/validation/advanced-tests/run-eb-tests.sh @@ -118,7 +118,7 @@ then # install clara if ! [ -d clara_installation ] then - ../../install-clara clara_installation + ../../bin/install-clara clara_installation fi fi