Skip to content

Commit 81b8cf3

Browse files
committed
use similar path, reduce checks
1 parent b27a210 commit 81b8cf3

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

install-clara

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,14 @@ do
9292
esac
9393
done
9494

95-
# Check requested installation path:
95+
# Check installation path:
9696
clara_home="$args"
97-
[ "${#args[@]}" -lt 1 ] && error "Missing PATH argument"
97+
[ "${#args[@]}" -lt 1 ] && error "Missing PATH argument."
9898
[ "${#args[@]}" -gt 1 ] && error "Extra PATH arguments: ${args[@]:1}"
9999
[ -e "$clara_home" ] && error "Installation PATH already exists: $clara_home"
100100
mkdir -p $clara_home || error "Cannot create installation PATH: $clara_home"
101101
clara_home=$(cd $clara_home && pwd) && rmdir $clara_home
102+
echo -e "\nConfigured for a CLARA_HOME installation at:\n\t$clara_home"
102103

103104
# Detect local COATJAVA installation and convert into an absolute path:
104105
if compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null
@@ -107,12 +108,11 @@ then
107108
echo -e "\nUsing local COATJAVA installation:\n\t$coatjava"
108109
elif ! [[ "$coatjava" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]
109110
then
110-
echo -e "\n\nWARNING: COATJAVA doesn't look like a local installation nor version number: $coatjava"
111+
echo -e "\nWARNING: COATJAVA doesn't look like a local installation nor version number: $coatjava"
111112
fi
112113

113114
# Do everything inside a new, temporary directory:
114-
[ -w "." ] || error "Current working directory is not writeable: \$PWD=$PWD"
115-
tmp_dir=$(mktemp -d tmp.install-clara.XXXXXX)
115+
tmp_dir=$(mktemp -d $clara_home.tmp.XXXXXX)
116116
[ $? -ne 0 ] && error "Cannot create temporary directory: $tmp_dir"
117117
tmp_dir=$(cd $tmp_dir && pwd)
118118
echo -e "\nCreating temporary build directory:\n\t$tmp_dir"
@@ -131,16 +131,15 @@ fi
131131
# COATJAVA:
132132
if ! compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null
133133
then
134-
echo -e "\nRetrieving COATJAVA version $coatjava ..."
134+
echo -e "\nRetrieving COATJAVA/$coatjava ..."
135135
get https://clasweb.jlab.org/clas12offline/distribution/coatjava/coatjava-$coatjava.tar.gz
136136
coatjava=./coatjava
137137
fi
138138
mkdir -p clara-cre/plugins/clas12/config
139139
cp -Lr $coatjava/etc $coatjava/bin $coatjava/lib* clara-cre/plugins/clas12
140140

141141
# GRAPES:
142-
echo -e "\nRetrieving GRAPES version $grapes ..."
142+
echo -e "\nRetrieving GRAPES/$grapes ..."
143143
get https://clasweb.jlab.org/clas12offline/distribution/grapes/grapes-$grapes.tar.gz
144144
mv grapes-$grapes clara-cre/plugins/grapes
145145
mv -f clara-cre/plugins/grapes/bin/clara-grapes clara-cre/bin/
146-

0 commit comments

Comments
 (0)