diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-06 16:58:37 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 15:22:09 +0100 |
| commit | b86866579ab3054a21120bca00b4bdfe8c8e575d (patch) | |
| tree | 1d5ead523683b6e8d4e61fbf89f6cb7551f85955 /testing/scripts/function.sh | |
| parent | 9574bf7a5e44a8ca5e77c8606683d0dc51ef3491 (diff) | |
| download | strongswan-b86866579ab3054a21120bca00b4bdfe8c8e575d.tar.bz2 strongswan-b86866579ab3054a21120bca00b4bdfe8c8e575d.tar.xz | |
Move execute wrappers to function.sh file
Diffstat (limited to 'testing/scripts/function.sh')
| -rwxr-xr-x | testing/scripts/function.sh | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh index daf56486b..4ee9b24b8 100755 --- a/testing/scripts/function.sh +++ b/testing/scripts/function.sh @@ -14,10 +14,31 @@ # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. +# execute command +# $1 - command to execute +# $2 - whether or not to log command exit status +# (0 -> disable exit status logging) +execute() +{ + cmd=${1} + echo $cmd >>$LOGFILE 2>&1 + $cmd >>$LOGFILE 2>&1 + status=$? + [ "$2" != 0 ] && log_status $status + if [ $status != 0 ]; then + echo + echo "! Command $cmd failed, exiting (status $status)" + echo "! Check why here $LOGFILE" + exit 1 + fi +} -############################################ -# output functions -# +# execute command in chroot +# $1 - command to execute +execute_chroot() +{ + execute "chroot $LOOPDIR $@" +} export TERM=xterm |