[Debian-live-changes] r1612 - in dists/trunk/live-helper: debian examples/cron

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-22 20:23:48 +0000 (Tue, 22 May 2007)
New Revision: 1612

Modified:
   dists/trunk/live-helper/debian/default
   dists/trunk/live-helper/examples/cron/daily.sh
   dists/trunk/live-helper/examples/cron/etch+beryl.sh
   dists/trunk/live-helper/examples/cron/etch.sh
   dists/trunk/live-helper/examples/cron/snapshots.sh
   dists/trunk/live-helper/examples/cron/weekly.sh
Log:


Modified: dists/trunk/live-helper/debian/default
===================================================================
--- dists/trunk/live-helper/debian/default	2007-05-22 20:07:46 UTC (rev 1611)
+++ dists/trunk/live-helper/debian/default	2007-05-22 20:23:48 UTC (rev 1612)
@@ -4,7 +4,7 @@
 
 DATE="`date +%Y%m%d`"
 DESTDIR="/srv/debian-live"
-TEMPDIR="/srv/tmp"
+TEMPDIR="/srv/tmp/live-helper"
 
 OPTIONS="--binary-indices disabled"
 

Modified: dists/trunk/live-helper/examples/cron/daily.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/daily.sh	2007-05-22 20:07:46 UTC (rev 1611)
+++ dists/trunk/live-helper/examples/cron/daily.sh	2007-05-22 20:23:48 UTC (rev 1612)
@@ -9,7 +9,7 @@
 
 DATE="`date +%Y%m%d`"
 DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp"
+TEMPDIR="/srv/tmp/live-helper"
 
 OPTIONS="--binary-indices disabled"
 

Modified: dists/trunk/live-helper/examples/cron/etch+beryl.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/etch+beryl.sh	2007-05-22 20:07:46 UTC (rev 1611)
+++ dists/trunk/live-helper/examples/cron/etch+beryl.sh	2007-05-22 20:23:48 UTC (rev 1612)
@@ -9,7 +9,7 @@
 
 DATE="r0_1.0~a10-1"
 DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp"
+TEMPDIR="/srv/tmp/live-helper"
 
 OPTIONS="--binary-indices disabled"
 

Modified: dists/trunk/live-helper/examples/cron/etch.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/etch.sh	2007-05-22 20:07:46 UTC (rev 1611)
+++ dists/trunk/live-helper/examples/cron/etch.sh	2007-05-22 20:23:48 UTC (rev 1612)
@@ -9,7 +9,7 @@
 
 DATE="r0_1.0~a10-1"
 DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp"
+TEMPDIR="/srv/tmp/live-helper"
 
 OPTIONS="--binary-indices disabled"
 

Modified: dists/trunk/live-helper/examples/cron/snapshots.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/snapshots.sh	2007-05-22 20:07:46 UTC (rev 1611)
+++ dists/trunk/live-helper/examples/cron/snapshots.sh	2007-05-22 20:23:48 UTC (rev 1612)
@@ -12,7 +12,7 @@
 
 export DEBEMAIL EMAIL DEBFULLNAME NAME
 
-BUILD="/srv/tmp2"
+TEMPDIR="/srv/tmp/svn-snapshots"
 SERVER="/srv/debian-unofficial/ftp/debian-live/debian-snapshot"
 
 DATE_START="`date -R`"
@@ -40,24 +40,24 @@
 for PACKAGE in ${PACKAGES}
 do
 	# Cleaning build directory
-	if [ -d "${BUILD}" ]
+	if [ -d "${TEMPDIR}" ]
 	then
-		rm -rf "${BUILD}"
+		rm -rf "${TEMPDIR}"
 	fi
 
 	# Creating build directory
-	mkdir -p "${BUILD}"
+	mkdir -p "${TEMPDIR}"
 
 	# Getting sources
-	cd "${BUILD}"
+	cd "${TEMPDIR}"
 	svn co svn://svn.debian.org/debian-live/dists/trunk/${PACKAGE} ${PACKAGE}
 
 	# Getting version
-	cd "${BUILD}"/${PACKAGE}
+	cd "${TEMPDIR}"/${PACKAGE}
 	VERSION="`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | awk -F- '{ print $1 }'`"
 
 	# Getting revision
-	cd "${BUILD}"/${PACKAGE}
+	cd "${TEMPDIR}"/${PACKAGE}
 	REVISION="`svn info | awk '/Last Changed Rev:/ { print $4 }'`"
 
 	# Check for existing package
@@ -66,16 +66,16 @@
 		UPDATE_INDICES="true"
 
 		# Renaming directory
-		mv "${BUILD}"/${PACKAGE} "${BUILD}"/${PACKAGE}-${VERSION}~${REVISION}
+		mv "${TEMPDIR}"/${PACKAGE} "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
 
 		# Building package
-		cd "${BUILD}"/${PACKAGE}-${VERSION}~${REVISION}
+		cd "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
 		find . -type d -name .svn | xargs rm -rf
 		dch --force-bad-version --newversion ${VERSION}~${REVISION} --distribution UNRELEASED Autobuild snapshot of SVN r${REVISION}.
 		dpkg-buildpackage -rfakeroot -sa -uc -us
 
 		# Removing sources
-		rm -rf "${BUILD}"/${PACKAGE}-${VERSION}~${REVISION}
+		rm -rf "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION}
 
 		# Creating directory
 		if [ ! -d "${SERVER}" ]
@@ -90,10 +90,10 @@
 		fi
 
 		# Moving packages
-		mv "${BUILD}"/${PACKAGE}* "${SERVER}"
+		mv "${TEMPDIR}"/${PACKAGE}* "${SERVER}"
 	else
 		# Remove sources
-		rm -rf "${BUILD}"/${PACKAGE}
+		rm -rf "${TEMPDIR}"/${PACKAGE}
 	fi
 done
 
@@ -127,4 +127,4 @@
 EOF
 
 # Removing build directory
-rm -rf "${BUILD}"
+rm -rf "${TEMPDIR}"

Modified: dists/trunk/live-helper/examples/cron/weekly.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/weekly.sh	2007-05-22 20:07:46 UTC (rev 1611)
+++ dists/trunk/live-helper/examples/cron/weekly.sh	2007-05-22 20:23:48 UTC (rev 1612)
@@ -9,7 +9,7 @@
 
 DATE="`date +%Y%m%d`"
 DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp"
+TEMPDIR="/srv/tmp/live-helper"
 
 OPTIONS="--binary-indices disabled"