Test availability of required commands

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index c73c454300e42562c4ac65db913b89744c7e80ee..31205bf208f9ba58566fa02dd7357c6a694df5e3 100755 (executable)
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -6,6 +6,8 @@ echo "Building base image"
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 
+check_commands debootstrap mkfs.ext3 qemu-img qemu-nbd sfdisk
+
 # 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/build-guestkernel b/testing/scripts/build-guestkernel
index 2fbe658a13dd93d7e2a0e3b6f63293d4a31444bc..84633bcd7c3e2e851f9331c11d64f47093f3dc09 100755 (executable)
--- a/testing/scripts/build-guestkernel
+++ b/testing/scripts/build-guestkernel
@@ -6,6 +6,8 @@ echo "Building guest kernel version $KERNELVERSION"
 
 [ -f "$KERNELCONFIG" ] || die "Kernel config $KERNELCONFIG not found"
 
+check_commands bunzip2 bzcat make wget
+
 mkdir -p $BUILDDIR
 cd $BUILDDIR
 

diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-umlhostfs
index 1028ef26657eb82311bd8f6e50aeceac2a6888d5..f5341038566fcfc0f5949028f680eaa83142f42b 100755 (executable)
--- a/testing/scripts/build-umlhostfs
+++ b/testing/scripts/build-umlhostfs
@@ -26,6 +26,8 @@ HOSTSDIR=$PWD/hosts
 [ -f $BASE ] || die "Base image $BASE not found"
 [ -f $HOSTDIR ] || die "Hosts directory $HOSTSDIR not found"
 
+check_commands qemu-img qemu-nbd
+
 load_qemu_nbd
 
 mkdir -p $BUILDDIR

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index c67e4d557710e918ebc2cde5c3e1f95279493049..0f8781c25fc88a29b9355237b1b9f9540314824e 100755 (executable)
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -22,6 +22,8 @@ echo "Building root image"
 
 [ -f "$ROOTFS" ] || die "Root image $ROOTFS not found"
 
+check_commands qemu-nbd
+
 load_qemu_nbd
 
 mkdir -p $ROOTFSDIR

diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh
index d72708246f60ae63fe78023ac07d96423e3fd566..2a801a7a545d4fc83d9b8c68bdec307e2f82b290 100755 (executable)
--- a/testing/scripts/function.sh
+++ b/testing/scripts/function.sh
@@ -148,6 +148,16 @@ load_qemu_nbd()
        fi
 }
 
+# check if given commands exist in $PATH
+# $* - commands to check
+check_commands()
+{
+       for i in $*
+       do
+               command -v $i >/dev/null || { die "Required command $i not found"; exit 1; }
+       done
+}
+
 #############################################
 # search and replace strings throughout a
 # whole directory