Skip to content

Commit 13c3389

Browse files
committed
use similar path, reduce checks
1 parent 51b22b6 commit 13c3389

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

install-clara

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,14 @@ do
8181
esac
8282
done
8383

84-
# Check requested installation path:
84+
# Check installation path:
8585
clara_home="$args"
86-
[ "${#args[@]}" -lt 1 ] && error "Missing PATH argument"
86+
[ "${#args[@]}" -lt 1 ] && error "Missing PATH argument."
8787
[ "${#args[@]}" -gt 1 ] && error "Extra PATH arguments: ${args[@]:1}"
8888
[ -e "$clara_home" ] && error "Installation PATH already exists: $clara_home"
8989
mkdir -p $clara_home || error "Cannot create installation PATH: $clara_home"
9090
clara_home=$(cd $clara_home && pwd) && rmdir $clara_home
91+
echo -e "\nConfigured for a CLARA_HOME installation at:\n\t$clara_home"
9192

9293
# Detect local COATJAVA installation and convert into an absolute path:
9394
if compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null
@@ -96,41 +97,40 @@ then
9697
echo -e "\nUsing local COATJAVA installation:\n\t$coatjava"
9798
elif ! [[ "$coatjava" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]
9899
then
99-
echo -e "\n\nWARNING: COATJAVA doesn't look like a local installation nor version number: $coatjava"
100+
echo -e "\nWARNING: COATJAVA doesn't look like a local installation nor version number: $coatjava"
100101
fi
101102

102103
# Do everything inside a new, temporary directory:
103-
[ -w "." ] || error "Current working directory is not writeable: \$PWD=$PWD"
104-
tmp_dir=$(mktemp -d tmp.install-clara.XXXXXX)
104+
tmp_dir=$(mktemp -d $clara_home.tmp.XXXXXX)
105105
[ $? -ne 0 ] && error "Cannot create temporary directory: $tmp_dir"
106106
tmp_dir=$(cd $tmp_dir && pwd)
107107
echo -e "\nCreating temporary build directory:\n\t$tmp_dir"
108108
cd $tmp_dir
109109

110110
# CLARA:
111-
echo -e "\nRetrieving CLARA version $clara ..."
111+
echo -e "\nRetrieving CLARA/$clara ..."
112112
get https://clasweb.jlab.org/clas12offline/distribution/clara/clara-cre-$clara.tar.gz
113113

114114
# COATJAVA:
115115
if ! compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null
116116
then
117-
echo -e "\nRetrieving COATJAVA version $coatjava ..."
117+
echo -e "\nRetrieving COATJAVA/$coatjava ..."
118118
get https://clasweb.jlab.org/clas12offline/distribution/coatjava/coatjava-$coatjava.tar.gz
119119
coatjava=./coatjava
120120
fi
121121
mkdir -p clara-cre/plugins/clas12/config
122122
cp -Lr $coatjava/etc $coatjava/bin $coatjava/lib* clara-cre/plugins/clas12
123123

124124
# GRAPES:
125-
echo -e "\nRetrieving GRAPES version $grapes ..."
125+
echo -e "\nRetrieving GRAPES/$grapes ..."
126126
get https://clasweb.jlab.org/clas12offline/distribution/grapes/grapes-$grapes.tar.gz
127127
mv grapes-$grapes clara-cre/plugins/grapes
128128
cp -r clara-cre/plugins/grapes/bin/clara-grapes clara-cre/bin/
129129

130130
# JRE:
131131
if ! [ -z ${jre+x} ]
132132
then
133-
echo -e "\nRetrieving JRE version $jre ..."
133+
echo -e "\nRetrieving JRE/$jre ..."
134134
mkdir clara-cre/jre
135135
get https://userweb.jlab.org/~gurjyan/clara-cre/linux-64-$jre.tar.gz clara-cre/jre
136136
fi

0 commit comments

Comments
 (0)