# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1304901913 -7200
# Node ID 2a9120e737ce304e5c339fccef6ab5f8ea7f1c02
# Parent  b7d2e1e5f32e1f2c384891985a22e5dafbf21fd1
cook: avoid screen grep error if no installed.cook.diff

diff -r b7d2e1e5f32e -r 2a9120e737ce cook
--- a/cook	Mon May 09 02:23:39 2011 +0200
+++ b/cook	Mon May 09 02:45:13 2011 +0200
@@ -347,10 +347,10 @@
 # Remove installed deps.
 remove_deps() {
 	# Now remove installed build deps.
-	diff="$CACHE/installed.diff"
-	deps=$(cat $diff | grep ^+[a-zA-Z0-9] | sed s/^+//)
-	nb=$(cat $diff | grep ^+[a-zA-Z0-9] | wc -l)
-	if [ -s "$CACHE/installed.diff" ]; then
+	diff="$CACHE/installed.cook.diff"
+	if [ -s "$CACHE/installed.cook.diff" ]; then
+		deps=$(cat $diff | grep ^+[a-zA-Z0-9] | sed s/^+//)
+		nb=$(cat $diff | grep ^+[a-zA-Z0-9] | wc -l)
 		gettext "Build dependencies to remove:"; echo " $nb"
 		gettext "Removing:"
 		for dep in $deps
@@ -359,7 +359,8 @@
 			yes | tazpkg remove $dep >/dev/null
 		done
 		echo -e "\n"
-		mv -f $CACHE/installed.diff $CACHE/installed.last.diff
+		# Keep the last diff for debug and info.
+		mv -f $CACHE/installed.cook.diff $CACHE/installed.diff
 	fi
 }
 
@@ -406,9 +407,9 @@
 	ls -1 > $CACHE/installed.cook && cd $CACHE
 	
 	# If a cook failed deps are not removed since we exit 1.
-	[ ! -s "installed.diff" ] && \
-		diff installed.list installed.cook > installed.diff
-	deps=$(cat installed.diff | grep ^+[a-zA-Z0-9] | wc -l)
+	[ ! -s "installed.cook.diff" ] && \
+		diff installed.list installed.cook > installed.cook.diff
+	deps=$(cat installed.cook.diff | grep ^+[a-zA-Z0-9] | wc -l)
 
 	# Get source tarball and make sure we have source dir named:
 	# $PACKAGE-$VERSION to be standard in receipts. Here we use tar.lzma