# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1245549371 -7200
# Node ID 9cf36f931f36ea2114d8979241b8f9636076016d
# Parent  c075da96e08a8b13abc22c4d987d9ac1d11c13dd
tazdev+tazpkg-web: Tiny fix and clean up

diff -r c075da96e08a -r 9cf36f931f36 slitaz-dev-tools/stuff/tazdev
--- a/slitaz-dev-tools/stuff/tazdev	Sun Jun 21 03:26:15 2009 +0200
+++ b/slitaz-dev-tools/stuff/tazdev	Sun Jun 21 03:56:11 2009 +0200
@@ -61,13 +61,18 @@
 {
 	if [ "$2" = "stable" ]; then
 		VERSION=stable
-		ROOTFS=$STABLE/chroot
+		SLITAZ=$STABLE
 	elif [ -n "$2" ]; then
-		ROOTFS=$2
+		# Undigest - custom ?
+		VERSION=$2
+		SLITAZ=/home/slitaz/$2
 	else
 		VERSION=cooking
-		ROOTFS=$COOKING/chroot
+		SLITAZ=$COOKING
 	fi
+	ROOTFS=$SLITAZ/chroot
+	HG_WOK=$SLITAZ/wok
+	BUILD_WOK=$SLITAZ/chroot/home/slitaz/wok
 }
 
 check_mirror()
@@ -84,10 +89,10 @@
 	else
 		REMOTE_DIR=$MIRROR_DIR/cooking/
 		LOCAL_DIR=$COOKING/packages/
-	fi	
+	fi
 }
 
-# Mount virtual Kernel file systems and chroot but check that nobody 
+# Mount virtual Kernel file systems and chroot but check that nobody
 # else has done mounts
 mount_chroot()
 {
@@ -101,7 +106,7 @@
 	fi
 }
 
-# Unmount virtual Kernel file systems on exit and ensure we are the last 
+# Unmount virtual Kernel file systems on exit and ensure we are the last
 # user before unmounting !
 umount_chroot()
 {
@@ -177,13 +182,7 @@
 		# file and so we can also modify receipt directly without affecting
 		# the Hg wok.
 		check_root
-		if [ "$2" = "stable" ]; then
-			HG_WOK=$STABLE/wok
-			BUILD_WOK=$STABLE/chroot/home/slitaz
-		else
-			HG_WOK=$COOKING/wok
-			BUILD_WOK=$COOKING/chroot/home/slitaz
-		fi
+		get_version
 		echo ""
 		echo "Hg wok    : $HG_WOK"
 		echo "Build wok : $BUILD_WOK"
@@ -199,7 +198,7 @@
 		cd $WEBSITE && hg pull && hg update
 		echo "" ;;
 	chroot)
-		# Chroot into a build env. Default to cooking configured in 
+		# Chroot into a build env. Default to cooking configured in
 		# tazdev.conf
 		check_root
 		get_version
diff -r c075da96e08a -r 9cf36f931f36 tazpkg-web/stuff/tazpkg-web
--- a/tazpkg-web/stuff/tazpkg-web	Sun Jun 21 03:26:15 2009 +0200
+++ b/tazpkg-web/stuff/tazpkg-web	Sun Jun 21 03:56:11 2009 +0200
@@ -236,8 +236,7 @@
 }
 
 # Prefer the Hg wok in the chroot. On host running Tazbb the wok's
-# are updated and copied automaticaly and it conflict with Tazdev
-# designed to maintain a local chroot environment without a build bot.
+# are updated and copied automaticaly and so more up-to-date.
 
 case "$1" in
 	stats)