|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
#!/bin/bash
|
|
|
|
|
|
|
|
|
|
# Copyright 2011 George Danchev <danchev@spnet.net>
|
|
|
|
|
# Copyright 2011 Thomas Schmitt <scdbackup@gmx.net>
|
|
|
|
|
# Copyright 2011 - 2014 Thomas Schmitt <scdbackup@gmx.net>
|
|
|
|
|
# Licensed under GNU GPL version 2 or later
|
|
|
|
|
|
|
|
|
|
set -e
|
|
|
|
@ -147,17 +147,10 @@ fi
|
|
|
|
|
T1=`date '+%s'`
|
|
|
|
|
set +e
|
|
|
|
|
|
|
|
|
|
if test -n "$PIPESTATUS"
|
|
|
|
|
then
|
|
|
|
|
# PIPESTATUS[0] should be available in bash
|
|
|
|
|
./${s} ${PASSED_OPTIONS} 2>&1 | count_lines >> ${CLOG}
|
|
|
|
|
RET="${PIPESTATUS[0]}"
|
|
|
|
|
else
|
|
|
|
|
# a more portable method which uses a temporary file to record exit value
|
|
|
|
|
return_wrapper ./${s} ${PASSED_OPTIONS} 2>&1 | count_lines >> ${CLOG}
|
|
|
|
|
RET=$(cat "$return_value_file")
|
|
|
|
|
rm "$return_value_file"
|
|
|
|
|
fi
|
|
|
|
|
return_wrapper ./${s} ${PASSED_OPTIONS} 2>&1 | count_lines >> ${CLOG}
|
|
|
|
|
RET=$(cat "$return_value_file")
|
|
|
|
|
rm "$return_value_file"
|
|
|
|
|
|
|
|
|
|
# echo "RET='$RET'" >/dev/tty
|
|
|
|
|
|
|
|
|
|
T2=`date '+%s'`
|
|
|
|
|