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

[Brendan M. Sleight]

The following commit has been merged in the master branch:
commit ed8fa9d6157d84c43e37ea8b2ef27272ad7e81af
Author: Brendan M. Sleight <bms.debian at barwap.com>
Date:   Sun Aug 10 18:35:27 2008 +0000

    Changing DIR to BASEDIR, removing whole of old current before new current
    
    Signed-off-by: Brendan M. Sleight <bms.debian at barwap.com>

diff --git a/daily-cron-script.sh b/daily-cron-script.sh
index 6e8010f..b5a9dad 100755
--- a/daily-cron-script.sh
+++ b/daily-cron-script.sh
@@ -7,7 +7,7 @@ BASEDIR="/home/autotesting"
 
 cd ${BASEDIR}/debian-live/autotesting
 
-exec >${DIR}/log/daily/autotesting.log 2>&1
+exec >${BASEDIR}/log/daily/autotesting.log 2>&1
 echo "New Day $(date)"
 
 # Test "daily" images
@@ -17,12 +17,12 @@ echo "New Day $(date)"
 ./run-batch-autotesting.sh webconverger.lst ${BASEDIR}/iso/daily/ ${BASEDIR}/video/daily/ /var/www/webconverger/i386/ webc-3.2.mini.iso.MD5SUM
 
 # Build our own images
-exec >${DIR}/log/daily/autobuild.log 2>&1
+exec >${BASEDIR}/log/daily/autobuild.log 2>&1
 for DIST in etch lenny sid
 do
     ./local_build_debian-live.sh ${BASEDIR}/iso/local/debian-live ${DIST} xfce
 done
 
 # Test our own images
-exec >>${DIR}/log/daily/autotesting.log 2>&1
+exec >>${BASEDIR}/log/daily/autotesting.log 2>&1
 ./run-batch-autotesting.sh local.lst ${BASEDIR}/iso/local/ ${BASEDIR}/video/local/ /var/www/local-build/debian-live/i386/
diff --git a/run-batch-autotesting.sh b/run-batch-autotesting.sh
index e551b76..4a0ac5b 100755
--- a/run-batch-autotesting.sh
+++ b/run-batch-autotesting.sh
@@ -120,7 +120,7 @@ do
     LN_S_CURRENT="$WEB_ROOT/$BASE_NAME/current"
     # making directories if required.
     mkdir -p "$LN_S_ROOT"
-    rm "$LN_S_CURRENT/*" -rf
+    rm $LN_S_CURRENT -rf
     mkdir -p "$LN_S_CURRENT"
     # get rid of the old current
     cp $VIDEO_NAME                "$LN_S_ROOT/video-booting.theora_${TODAY}.ogg"

-- 
debian-live/autotesting