hpcchris/sit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Renamed $SCLASSFILE to $sit_classfile and reordered code.

Browse source
This commit is contained in:
Christoph Niethammer 2016-05-02 08:55:20 +00:00
parent 6fdacf1b33
commit 479c6c424c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sit
View file

@ -32,6 +32,8 @@ function usage() {
exit 0 exit 0
} }
# sit class file to be installed
sit_classfile=$1
# sit action to be performed # sit action to be performed
sit_action=$2 sit_action=$2
if [[ -n $sit_action ]] ; then if [[ -n $sit_action ]] ; then
@ -155,12 +157,11 @@ if [ ! -z "$MPI" ] ; then
MPI_DIR=${MPI_DIR:=$(dirname $(dirname $(which $MPICC)))} MPI_DIR=${MPI_DIR:=$(dirname $(dirname $(which $MPICC)))}
fi fi
SCLASSFILE=$1
if [ -f $SCLASS_DIR/$SCLASSFILE ] ; then if [ -f $SCLASS_DIR/$sit_classfile ] ; then
source $SCLASS_DIR/$SCLASSFILE source $SCLASS_DIR/$sit_classfile
else else
sit_fail "Could not find file $SCLASS_DIR/$SCLASSFILE" sit_fail "Could not find file $SCLASS_DIR/$sit_classfile"
fi fi
PACKAGENAME=${PACKAGENAME:=$PACKAGE} PACKAGENAME=${PACKAGENAME:=$PACKAGE}
@ -191,7 +192,7 @@ LOGDIR=${WORKDIR}
# source the package class file a second time, so we can modify variables # source the package class file a second time, so we can modify variables
# using their default values. (Defaults depend on other vairables in # using their default values. (Defaults depend on other vairables in
# the class file like CATEGORY or PACKAGE) # the class file like CATEGORY or PACKAGE)
source $SCLASS_DIR/$SCLASSFILE source $SCLASS_DIR/$sit_classfile
echo "Package name: $PACKAGENAME" echo "Package name: $PACKAGENAME"
echo "Installation PREFIX: $PREFIX" echo "Installation PREFIX: $PREFIX"