# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1304763093 -7200
# Node ID d5ac94ecfdf00916803d75a6cd4246255d46e0fa
# Parent  4341efb4e1604f4af522b25c477d20129cd1762f
cook: Include Erjo patches - Beter test for installed packages and init DB files

diff -r 4341efb4e160 -r d5ac94ecfdf0 cook
--- a/cook	Sat May 07 05:41:58 2011 +0200
+++ b/cook	Sat May 07 12:11:33 2011 +0200
@@ -99,6 +99,17 @@
 	fi
 }
 
+# Initialise files used in $CACHE
+init_db_files() {
+	gettext "Creating directories structure in:"; echo " $SLITAZ"
+	mkdir -p $WOK $PKGS $SRC $CACHE $LOGS
+	gettext "Creating DB files in:"; echo " $CACHE"
+	for f in $activity $command $broken $blocked
+	do
+		touch $f
+	done
+}
+
 # QA: check a receip consistency befor building.
 receipt_quality() {
 	gettext -e "QA: checking package receipt...\n"
@@ -351,7 +362,7 @@
 	[ "$DEPENDS" ] && gettext -e "Checking build dependencies...\n"
 	for dep in $BUILD_DEPENDS
 	do
-		if [ ! -d "$INSTALLED/$dep" ]; then
+		if [ ! -f "$INSTALLED/$dep/receipt" ]; then
 			# Try local package first
 			if [ -f "$PKGS/$dep-*.tazpkg" ]; then
 				gettext "Installing dep (local):"; echo " $dep"
@@ -523,7 +534,7 @@
 	usage|help|-u|-h)
 		 usage ;;
 	list-wok)
-		gettext "List of packages in:"; echo " $WOK"
+		gettext -e "\nList of packages in:"; echo " $WOK"
 		separator
 		cd $WOK && ls -1
 		separator
@@ -535,18 +546,18 @@
 		echo "Cook: setting up the environment" | log
 		gettext -e "\nSetting up your environment\n"
 		separator && cd $SLITAZ
-		gettext "Creating directories structure in:"; echo " $SLITAZ"
-		mkdir -p $WOK $PKGS $SRC $CACHE $LOGS
+		init_db_files
 		gettext -e "Checking for packages to install...\n"
 		for pkg in $SETUP_PKGS
 		do
-			[ ! -d "$INSTALLED/$pkg" ] && tazpkg get-install $pkg
+			[ ! -f "$INSTALLED/$pkg/receipt" ] && tazpkg get-install $pkg
 		done
 
 		# Handle --options
 		case "$2" in
 			--wok|-w)
-				[ ! -d "$INSTALLED/mercurial" ] && tazpkg get-install mercurial
+				[ ! -f "$INSTALLED/mercurial/receipt" ] && \
+					tazpkg get-install mercurial
 				[ -d "$WOK" ] && echo -e "A wok already exist.\n" && exit 1
 				hg clone $HG_URL ;;
 		esac