Skip to content

Commit 1f7f635

Browse files
committed
Reapply "remove clara tarball option (#1462)"
This reverts commit 2348454.
1 parent 7df1a6f commit 1f7f635

2 files changed

Lines changed: 6 additions & 14 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
- name: build
7373
run: |
7474
./build-coatjava.sh --lfs --no-progress -T${{ env.nthreads }}
75-
./bin/install-clara -b -c ./coatjava ./clara
75+
./bin/install-clara -c ./coatjava ./clara
7676
- name: tar # tarball to preserve permissions
7777
run: |
7878
tar czvf coatjava.tar.gz coatjava
@@ -102,7 +102,7 @@ jobs:
102102
- name: build
103103
run: |
104104
./build-coatjava.sh --lfs --no-progress -T${{ env.nthreads }}
105-
./bin/install-clara -b -c ./coatjava ./clara
105+
./bin/install-clara -c ./coatjava ./clara
106106
- name: tar # tarball to preserve permissions
107107
run: |
108108
tar czvf coatjava.tar.gz coatjava

‎bin/install-clara‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,12 @@ trap cleanup EXIT
7171
# Configure:
7272
debug=0
7373
args=()
74-
usage="Usage: install-clara [-v] [-b] [-c COATJAVA] [-f CLARA] [-g GRAPES] PATH"
74+
usage="Usage: install-clara [-v] [-c COATJAVA] [-f CLARA] [-g GRAPES] PATH"
7575
info="""
7676
- The default CLARA / GRAPES versions are $clara / $grapes
7777
- COATJAVA can also be specified as a local installation directory
7878
- If the COATJAVA version is not specified, it will try to auto-detect it.
79-
- [-v adds verbosity and disables cleanup]
80-
- [-b builds clara from source]"""
79+
- [-v adds verbosity and disables cleanup]"""
8180

8281
while [[ $# -gt 0 ]]
8382
do
@@ -86,7 +85,6 @@ do
8685
-f) clara="$2" && shift && shift ;;
8786
-c) coatjava="$2" && shift && shift ;;
8887
-g) grapes="$2" && shift && shift ;;
89-
-b) build=1 && shift ;;
9088
-v) let debug=$debug+1 && shift ;;
9189
-*|--*) echo -e "$usage\n\nUnknown option: $1" && exit 1 ;;
9290
*) args+=("$1") && shift ;;
@@ -126,14 +124,8 @@ tmp_dir=$(cd $tmp_dir && pwd)
126124
cd $tmp_dir
127125

128126
# CLARA:
129-
if ! [ -z ${build+x} ]
130-
then
131-
echo -e "\nBuilding CLARA from source ..."
132-
build_clara $PWD/clara-cre
133-
else
134-
echo -e "\nRetrieving CLARA version $clara ..."
135-
get https://clasweb.jlab.org/clas12offline/distribution/clara/clara-cre-$clara.tar.gz
136-
fi
127+
echo -e "\nBuilding CLARA from source ..."
128+
build_clara $PWD/clara-cre
137129

138130
# COATJAVA:
139131
if ! compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null

0 commit comments

Comments
 (0)