Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 4 additions & 12 deletions bin/install-clara
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -86,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 ;;
Expand Down Expand Up @@ -126,14 +124,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
Expand Down
Loading