Move execute wrappers to function.sh file

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 7e380f80cf85ce547267a25ecb741df5a1cfa433..de247786b54e6acff4d4c6117554c39086620cfd 100755 (executable)
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -13,31 +13,6 @@ DIR=`dirname $0`
 [ -f $DIR/../testing.conf ] || die "!! Configuration file 'testing.conf' not found"
 . $DIR/../testing.conf
 
-# 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
-       $cmd >>$LOGFILE 2>&1
-       status=$?
-       [ "$2" != 0 ] && log_status $status
-       if [ $status != 0 ]; then
-               echo "! command $cmd failed, exiting (status $status)"
-               echo "! check why here $LOGFILE"
-               exit 1
-       fi
-}
-
-# execute command in chroot
-# $1 - command to execute
-execute_chroot()
-{
-       execute "chroot $LOOPDIR $@"
-}
-
 # additional packages
 EXTRAS=build-essential,gperf,libgmp-dev,libldap2-dev,libcurl4-openssl-dev,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core
 SERVICES="isc-dhcp-server apache2 slapd"

diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh
index daf56486bc8591bf32b85c41e312f2bb33db396d..4ee9b24b83eae8ba579a5fbff2d5c60303ad9b96 100755 (executable)
--- 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