general code cleanup and remove cache handling

diff --git a/liveboot_build.sh b/liveboot_build.sh
index 8bd601a17a06fac046b5d9f361fdf17955331b70..60983dc4697d4a0bac77093ab90988f6b3e3acfa 100755 (executable)
--- a/liveboot_build.sh
+++ b/liveboot_build.sh
@@ -3,23 +3,18 @@
 # copyright 2012 Holger Levsen <holger@layer-acht.org>
 # GPL2 licenced
 
-
 set -e
-
 export
 
-export DIST=squeeze 
-export PB_SUITE=production-proposed-updates
-
 #
 # Define default settings
 #
+export DIST=squeeze
+export PB_SUITE=production-proposed-updates
 RSYNC_SRC=/srv/mirror/liveboot
 RSYNC_FILTER=''
 
-
 # WORK IN PROGRESS
-
 # ri server
 RSYNC_DST1="liveboot@riserver/liveboot/" 
 # pbb (mgmt5)
@@ -30,7 +25,6 @@ RSYNC_DST3="liveboot@10.252.1.1/liveboot/"
 figlet "still work in progress, but... getting there"
 
 BUILD_SCRIPT=$(mktemp)
-
 cat > $BUILD_SCRIPT <<-EOF
 cd /srv/build
 git clone git://git/ri/liveboot.git
@@ -39,16 +33,13 @@ git checkout $GIT_BRANCH
 [ -d /srv/build/cache ] && mv /srv/build/cache .
 ./build.sh $BUILD_NUMBER $GIT_BRANCH
 EOF
-
 sudo pbuilder --execute --bindmounts /srv/build/ -- $BUILD_SCRIPT
 
 
 # FIXME: too much sudo here...
 cd /srv/build/liveboot/builds
 sudo mv *-* /srv/mirror/liveboot
-cd /srv/build/liveboot
-sudo mv cache ..
-cd ..
+cd /srv/build/
 sudo rm liveboot -Rf
 
 #
@@ -71,7 +62,7 @@ echo "mirror to DCs is MISSING"
 # cleanup /srv/mirror, keep MAX number of images
 #
 #MAX=15
-#cd $RSYNC_BASE
+#cd $RSYNC_SRC
 #COUNT=0
 #for i in $(ls -atd1 ./${LIVE_TYPE}-*) ; do
 #        let COUNT=COUNT+1
@@ -83,4 +74,5 @@ echo "mirror to DCs is MISSING"
 #done
 
 #figlet "cleanup OK"
-echo "cleanup DISABLED"
+echo -n "cleanup DISABLED: "
+du -sh /srv/mirror/liveboot