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

Bugfix: Fixing problems with return values.

Browse source
This commit is contained in:
Christoph Niethammer 2011-03-03 13:07:56 +00:00
parent 5a761c9cc7
commit 0b648f89d4
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
functions.sh
View file

@ -1,10 +1,10 @@
sit_fail() { sit_fail() {
msg=$0 msg="Fail: $1"
echo "$msg" echo "$msg"
exit 1 exit 1
} }
sit_info() { sit_info() {
msg=$0 msg=$1
echo $msg echo $msg
} }
@ -44,7 +44,7 @@ src_unpack() {
sit_unpack() { sit_unpack() {
sit_info "Unpacking sources ..." sit_info "Unpacking sources ..."
cd ${WORKDIR} cd ${WORKDIR}
src_unpack || sit_fail "Unpacking failed" src_unpack
} }
src_configure() { src_configure() {

13
sit
View file

@ -17,6 +17,7 @@ if [[ -e $SIT_CONFIG_FILE ]] ; then
fi fi
source "$SIT_PATH/functions.sh" source "$SIT_PATH/functions.sh"
# compiler to use # compiler to use
# (gnu|intel|pgi) # (gnu|intel|pgi)
COMPILER=${COMPILER:=gnu} COMPILER=${COMPILER:=gnu}
@ -122,12 +123,12 @@ fi
mkdir -p ${WORKDIR} mkdir -p ${WORKDIR}
mkdir -p ${BUILDDIR} mkdir -p ${BUILDDIR}
mkdir -p ${LOGDIR} mkdir -p ${LOGDIR}
sit_unpack 2>&1 | tee "$LOGDIR/unpack.log" sit_unpack; 2>&1 | tee "$LOGDIR/unpack.log"; ( exit ${PIPESTATUS} )
sit_configure 2>&1 | tee "$LOGDIR/configure.log" sit_configure 2>&1 | tee "$LOGDIR/configure.log"; ( exit ${PIPESTATUS} )
sit_build 2>&1 | tee "$LOGDIR/make.log" sit_build 2>&1 | tee "$LOGDIR/make.log"; ( exit ${PIPESTATUS} )
sit_pretest 2>&1 | tee "$LOGDIR/pretest.log" sit_pretest 2>&1 | tee "$LOGDIR/pretest.log"; ( exit ${PIPESTATUS} )
sit_install 2>&1 | tee "$LOGDIR/make_install.log" sit_install 2>&1 | tee "$LOGDIR/make_install.log"; ( exit ${PIPESTATUS} )
sit_posttest 2>&1 | tee "$LOGDIR/posttest.log" sit_posttest 2>&1 | tee "$LOGDIR/posttest.log"; ( exit ${PIPESTATUS} )
sit_copy_logs sit_copy_logs
sit_setperms sit_setperms