diff -r 6ed4368b4a9e tools/check/check_brctl --- a/tools/check/check_brctl Sun Oct 15 09:53:20 2006 +0100 +++ b/tools/check/check_brctl Sun Oct 15 10:36:00 2006 +0200 @@ -1,10 +1,27 @@ -#!/bin/bash +#!/bin/sh # CHECK-INSTALL -function error { - echo - echo ' *** Check for the bridge control utils (brctl) FAILED' - exit 1 -} +RC=0 -which brctl 1>/dev/null 2>&1 || error +case ${OS} in +OpenBSD|NetBSD|FreeBSD) + # These systems have a bridge builtin + TOOL="brconfig" + which ${TOOL} 1>/dev/null 2>&1 || RC=1 + ;; +Linux) + TOOL="brctl" + which ${TOOL} 1>/dev/null 2>&1 || RC=1 + ;; +*) + TOOL="" + echo "Unknown OS" && RC=1 + ;; +esac + +if test ${RC} -ne 0; then + echo + echo " *** Check for the bridge control utils (${TOOL}) FAILED" +fi + +exit ${RC} diff -r 6ed4368b4a9e tools/check/check_iproute --- a/tools/check/check_iproute Sun Oct 15 09:53:20 2006 +0100 +++ b/tools/check/check_iproute Sun Oct 15 10:36:00 2006 +0200 @@ -1,11 +1,26 @@ -#!/bin/bash +#!/bin/sh # CHECK-INSTALL -function error { - echo - echo ' *** Check for iproute (ip addr) FAILED' - exit 1 -} +RC=0 -ip addr list 1>/dev/null 2>&1 || error +case ${OS} in +OpenBSD|NetBSD|FreeBSD) + TOOL="ifconfig" + eval ${TOOL} -a 1>/dev/null 2>&1 || RC=1 + ;; +Linux) + TOOL="ip addr" + eval ${TOOL} list 1>/dev/null 2>&1 || RC=1 + ;; +*) + TOOL="" + echo "Unknown OS" && RC=1 + ;; +esac +if test ${RC} -ne 0; then + echo + echo " *** Check for iproute (${TOOL}) FAILED" +fi + +exit ${RC} diff -r 6ed4368b4a9e tools/check/check_python --- a/tools/check/check_python Sun Oct 15 09:53:20 2006 +0100 +++ b/tools/check/check_python Sun Oct 15 10:36:00 2006 +0200 @@ -1,10 +1,13 @@ -#!/bin/bash +#!/bin/sh # CHECK-BUILD CHECK-INSTALL -function error { - echo - echo " *** Check for Python version >= 2.2 FAILED" - exit 1 -} +RC=0 -python -V 2>&1 | cut -d ' ' -f 2 | grep -q '^2.[2345]' || error +python -V 2>&1 | cut -d ' ' -f 2 | grep -q '^2.[2345]' || RC=1 + +if test ${RC} -ne 0; then + echo + echo " *** Check for Python version >= 2.2 FAILED" +fi + +exit ${RC} diff -r 6ed4368b4a9e tools/check/check_zlib_devel --- a/tools/check/check_zlib_devel Sun Oct 15 09:53:20 2006 +0100 +++ b/tools/check/check_zlib_devel Sun Oct 15 10:36:00 2006 +0200 @@ -1,11 +1,14 @@ -#!/bin/bash +#!/bin/sh # CHECK-BUILD -function error { - echo - echo " *** Check for zlib headers FAILED" - exit 1 -} +RC=0 set -e -[ -e /usr/include/zlib.h ] || error +test -r /usr/include/zlib.h || RC=1 + +if test ${RC} -ne 0; then + echo + echo " *** Check for zlib headers FAILED" +fi + +exit ${RC} diff -r 6ed4368b4a9e tools/check/check_zlib_lib --- a/tools/check/check_zlib_lib Sun Oct 15 09:53:20 2006 +0100 +++ b/tools/check/check_zlib_lib Sun Oct 15 10:36:00 2006 +0200 @@ -1,11 +1,14 @@ -#!/bin/bash +#!/bin/sh # CHECK-BUILD CHECK-INSTALL -function error { - echo - echo " *** Check for zlib library FAILED" - exit 1 -} +RC=0 set -e -ldconfig -p | grep -q libz.so || error +ldconfig -v 2>&1 | grep -q libz.so || RC=1 + +if test ${RC} -ne 0; then + echo + echo " *** Check for zlib library FAILED" +fi + +exit ${RC} diff -r 6ed4368b4a9e tools/check/chk --- a/tools/check/chk Sun Oct 15 09:53:20 2006 +0100 +++ b/tools/check/chk Sun Oct 15 10:36:00 2006 +0200 @@ -1,8 +1,9 @@ -#!/bin/bash +#!/bin/sh -function usage { +func_usage () +{ echo "Usage:" - echo "\t$0 [build|install|clean]" + echo " $0 [build|install|clean]" echo echo "Check suitability for Xen build or install." echo "Exit with 0 if OK, 1 if not." @@ -12,7 +13,9 @@ function usage { exit 1 } -export PATH=${PATH}:/sbin:/usr/sbin +PATH=${PATH}:/sbin:/usr/sbin +OS=`uname -s` +export PATH OS case $1 in build) @@ -25,7 +28,7 @@ case $1 in exit 0 ;; *) - usage + func_usage ;; esac @@ -54,4 +57,4 @@ for f in check_* ; do fi done -exit $failed +exit ${failed}