[SCM] debian-live/autotesting branch, master, updated. 9c5143b50da2155314f60f09166d45a23b762492

[Chris Lamb]

The following commit has been merged in the master branch:
commit 1545a778e1005bdf27df57d4aa6969fcad37816c
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Aug 8 23:04:49 2008 +0100

    Use heredoc and "&&" instead of long echo lines and "-a".
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/autotesting.sh b/autotesting.sh
index bb95509..daa028b 100755
--- a/autotesting.sh
+++ b/autotesting.sh
@@ -20,18 +20,19 @@ do
 done
 shift `expr $OPTIND - 1`
 
-if [ -z "$1" -a -z "$2" -a -z "$3" ]; then
-    echo "usage: $0 [-p path to video-qemu-booting-iso.sh ] [-q alternative qemu binary name] [-t time to run qemu] [-v (0 to 10) encoding quality for video] /foo/bar/iso.directory/ /foo/bar/video.directory/ "
-    echo
-    echo " This script runs the video-qemu-booting-iso.sh for each iso in a directory. "
-    echo
-    echo " This script will take _along_ time to run. Approx 1 hour per iso."
-    echo " Basically for time to run = number of isos x time to run qmeu x 3  seconds"
-    echo " For testing the set-up use -t with a small value e.g. -t 10"
-    echo
-    echo " The use of -q could allow qemu-ppc be used once Debian bug #388735 is resolved."
-
-    exit
+if [ -z "$1" ] && [ -z "$2" ] && [ -z "$3" ]; then
+    cat << EOF
+usage: $0 [-p path to video-qemu-booting-iso.sh ] [-q alternative qemu binary name] [-t time to run qemu] [-v (0 to 10) encoding quality for video] /foo/bar/iso.directory/ /foo/bar/video.directory/ 
+
+ This script runs the video-qemu-booting-iso.sh for each iso in a directory. 
+
+ This script will take _along_ time to run. Approx 1 hour per iso.
+ Basically for time to run = number of isos x time to run qmeu x 3  seconds
+ For testing the set-up use -t with a small value e.g. -t 10
+
+ The use of -q could allow qemu-ppc be used once Debian bug #388735 is resolved.
+EOF
+    exit 0
 fi
 
 ISODIR=$1
diff --git a/local_build_debian-live.sh b/local_build_debian-live.sh
index bc986de..aa72f4c 100755
--- a/local_build_debian-live.sh
+++ b/local_build_debian-live.sh
@@ -5,7 +5,7 @@
 #  Kick auotesting to test..
 # debian-live-sid-i386-xfce.iso
 
-if [ -z "$1" -a -z "$2" ]
+if [ -z "$1" ] && [ -z "$2" ]
 then
     echo " Usage $0 build.iso distribution packages-list "
     exit
diff --git a/run-batch-autotesting.sh b/run-batch-autotesting.sh
index 692fc7b..fdc5f8a 100755
--- a/run-batch-autotesting.sh
+++ b/run-batch-autotesting.sh
@@ -36,7 +36,7 @@
 
 VIDEO_QEMU_BOOTING="/home/autotesting/debian-live/autotesting/video-qemu-booting-iso.sh"
 
-if [ -z "$1" -a -z "$2" -a -z "$3" -a -z "$4" ]
+if [ -z "$1" ] && [ -z "$2" ] && [ -z "$3" ] && [ -z "$4" ]
 then
     echo "usage: $0 directory/ "
     echo
diff --git a/video-qemu-booting-iso.sh b/video-qemu-booting-iso.sh
index c345414..3f10c13 100755
--- a/video-qemu-booting-iso.sh
+++ b/video-qemu-booting-iso.sh
@@ -249,7 +249,7 @@ do
 done
 shift `expr $OPTIND - 1`
 
-if [ -z "$1" -a -z "$2" ]; then
+if [ -z "$1" ] && [ -z "$2" ]; then
     echo "usage: $0 [-s \"keys,to,send,to,qemu\"] [-p port_number for qemu-monitor] [-g geometry of vncsession] [-d dimensions of video] [-t time to run qemu] [-v (0 to 10) encoding quality for video] [-q alternative qemu binary name] [-n Do not gernerate a preview of the video.ogg.jpg] IsoToTest.iso Video.ogg " 
     echo
     echo " This script boots a livecd using qemu and records a video of the process. "

-- 
debian-live/autotesting