# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1304546761 -7200
# Node ID fa9a36a8c1f4bf5fc959a00bae767584ecf46aea
# Parent  97ff632519573d4b9848c24b1df47762e0aff02e
cooker: more log and better (again)

diff -r 97ff63251957 -r fa9a36a8c1f4 cook
--- a/cook	Wed May 04 23:36:02 2011 +0200
+++ b/cook	Thu May 05 00:06:01 2011 +0200
@@ -62,7 +62,7 @@
 	echo -e "\\033[0;39m ]"
 }
 
-# Log activities.
+# Log activities, we want first letter capitalized.
 log() {
 	grep ^[a-zA-Z0-9] | \
 		sed s"#^[A-Z]\([^']*\)#$(date '+%Y-%m-%d %H:%M') : \0#" >> $activity
@@ -472,7 +472,7 @@
 		gettext -e "All done, ready to cook packages :-)\n\n" ;;
 	test)
 		# Test a cook environment.
-		echo "cook test: testing the cook environment" | log
+		echo "Cook test: testing the cook environment" | log
 		[ ! -d "$WOK" ] && exit 1
 		[ ! -d "$WOK/cooktest" ] && cp -r $DATA/cooktest $WOK
 		cook cooktest ;;
@@ -498,7 +498,7 @@
 		[ -z "$2" ] && gettext -e "\nNo list in argument.\n\n" && exit 1
 		[ ! -f "$2" ] && gettext -e "\nNo list found:" && \
 			echo -e " $2\n" && exit 1
-		echo "cook list: Starting to cook: $2" | log
+		echo "Cook list starting: $2" | log
 		for pkg in $(cat $2)
 		do
 			cook $pkg || broken
@@ -519,7 +519,7 @@
 		[ ! -d "$PKGS" ] && \
 			gettext -e "\nPackages directory dont exist\n\n" && exit 1
 		cd $PKGS
-		echo "cook pkglist: Creating packages list" | log
+		echo "Cook pkglist: Creating all packages list" | log
 		gettext -e "\nCreating lists for:"; echo " $PKGS"
 		separator
 		rm -f packages.* files.list*
diff -r 97ff63251957 -r fa9a36a8c1f4 cooker
--- a/cooker	Wed May 04 23:36:02 2011 +0200
+++ b/cooker	Thu May 05 00:06:01 2011 +0200
@@ -50,7 +50,7 @@
 [ -s "$activity" ] && tail -n 20 $activity > /tmp/tail && \
 	mv -f /tmp/tail $activity
 
-# Log activities.
+# Log activities, we want first letter capitalized.
 log() {
 	grep ^[a-zA-Z0-9] | \
 		sed s"#^[A-Z]\([^']*\)#$(date '+%Y-%m-%d %H:%M') : \0#" >> $activity
@@ -155,7 +155,7 @@
 	if [ -s "$commits" ]; then
 		for pkg in $(cat $commits)
 		do
-			echo "cook started for: <a href='cooker.cgi?log=$pkg'>$pkg</a>" | log
+			echo "Cook started for: <a href='cooker.cgi?log=$pkg'>$pkg</a>" | log
 			echo "cook:$pkg" > $status
 			cook $pkg || broken
 			sed -i /^${pkg}$/d $commits
@@ -172,7 +172,7 @@
 	--setup)
 		# Setup the Cooker environment.
 		echo -e "\nSetting up the Cooker"
-		echo "cooker --setup: $SLITAZ" | log
+		echo "Cooker --setup using: $SLITAZ" | log
 		separator
 		for pkg in mercurial rsync slitaz-toolchain
 		do
@@ -209,7 +209,7 @@
 	--pkg=*)
 		# Same as 'cook pkg' but with log for web interface.
 		pkg=${1#--pkg=}
-		echo "cook started for: <a href='cooker.cgi?log=$pkg'>$pkg</a>" | log
+		echo "Cook started for: <a href='cooker.cgi?log=$pkg'>$pkg</a>" | log
 		cook $pkg || broken ;;
 	--cat=*)
 		# Cook all packages of a category.
@@ -223,7 +223,7 @@
 		cook_order | tee $LOGS/cooker-order.log
 		for pkg in $(cat $cooklist)
 		do
-			echo "cook started for: <a href='cooker.cgi?log=$pkg'>$pkg</a>" | log
+			echo "Cook started for: <a href='cooker.cgi?log=$pkg'>$pkg</a>" | log
 			cook $pkg || broken
 		done
 		;;
@@ -251,6 +251,7 @@
 		done && sed -i /^$/d $cooklist
 
 		echo "Packages to cook: $(cat $cooklist | wc -l)"
+		echo "Packages to cook: $(cat $cooklist | wc -l)" | log
 		cook_order | tee $LOGS/cooker-order.log
 
 		# Clean DB files
@@ -269,7 +270,7 @@
 		# Get revisions.
 		cd $wok || ( echo "" && exit 1 )
 		cur=$(hg head --template '{rev}\n')
-		echo "Updating Hg wok" | log
+		echo "Updating Hg wok: ${wok}-hg" | log
 		echo "hg:pull" > $status
 		cd ${wok}-hg && hg pull -u
 		new=$(hg head --template '{rev}\n')
@@ -284,7 +285,7 @@
 			cp -a ${wok}-hg/* $wok
 			cp -a ${wok}-hg/.hg $wok
 		else
-			echo "No changes: $cur vs $new" | log
+			echo "No revision changes: $cur vs $new" | log
 			separator && echo "" && exit 0
 		fi