# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1304610344 -7200
# Node ID c3c30b1506b8fb545adccaf2a5118a6364a87c10
# Parent  dcf50aa1bb76f7e31a322fa0a0f1029a8d38f7bb
Improve debug info and syntax highlither

diff -r dcf50aa1bb76 -r c3c30b1506b8 cook
--- a/cook	Thu May 05 17:05:19 2011 +0200
+++ b/cook	Thu May 05 17:45:44 2011 +0200
@@ -213,7 +213,7 @@
 
 # Display debugging erroe info.
 debug_info() {
-	echo "Debug information"
+	echo -e "\nDebug information"
 	separator
 	fgrep ERROR $LOGS/$pkg.log
 	separator && echo ""
@@ -388,11 +388,7 @@
 	fi
 	# ERROR can be echoed any time in cookit()
 	if grep -q ^ERROR $LOGS/$pkg.log; then
-		echo ""
-		debug_info | tee $CACHE/debug
-		# Debug info on top, easier to check errors.
-		cat $CACHE/debug $LOGS/$pkg.log > $CACHE/$pkg.debug
-		mv -f $CACHE/$pkg.debug $LOGS/$pkg.log
+		debug_info | tee -a $LOGS/$pkg.log
 		exit 1
 	fi
 }
@@ -674,7 +670,7 @@
 			fi
 		fi
 		# Finally we DONT WANT to build the *-dev or packages with WANTED="$pkg"
-		# You automation: use the Cooker Build Bot.
+		# You want automation: use the Cooker Build Bot.
 		#[ -d "$WOK/$pkg-dev" ] && cook $pkg-dev
 		;;
 esac
diff -r dcf50aa1bb76 -r c3c30b1506b8 web/cooker.cgi
--- a/web/cooker.cgi	Thu May 05 17:05:19 2011 +0200
+++ b/web/cooker.cgi	Thu May 05 17:45:44 2011 +0200
@@ -26,17 +26,21 @@
 
 # Put some colors in log and DB files.
 syntax_highlighter() {
-	sed -e 's#OK$#<span class="span-ok">OK</span>#g' \
-		-e 's#yes$#<span class="span-ok">yes</span>#g' \
-		-e 's#no$#<span class="span-no">no</span>#g' \
-		-e 's#error$#<span class="span-error">error</span>#g' \
-		-e 's#ERROR:#<span class="span-error">ERROR:</span>#g' \
-		-e s"#^Executing:\([^']*\).#<span class='span-sky'>\0</span>#"g \
-		-e s"#^====\([^']*\).#<span class='span-line'>\0</span>#"g \
-		-e s"#ftp://\([^']*\).*#<a href='\0'>\0</a>#"g	\
-		-e s"#http://\([^']*\).*#<a href='\0'>\0</a>#"g \
-		-e s"#^\#\([^']*\)#<span class='sh-comment'>\0</span>#"g 
-		#-e s"#\"\([^']*\)\"#<span class='sh-val'>\0</span>#"g
+	case $1 in
+		log)
+			sed -e 's#OK$#<span class="span-ok">OK</span>#g' \
+				-e 's#yes$#<span class="span-ok">yes</span>#g' \
+				-e 's#no$#<span class="span-no">no</span>#g' \
+				-e 's#error$#<span class="span-error">error</span>#g' \
+				-e 's#ERROR:#<span class="span-error">ERROR:</span>#g' \
+				-e s"#^Executing:\([^']*\).#<span class='span-sky'>\0</span>#"g \
+				-e s"#^====\([^']*\).#<span class='span-line'>\0</span>#"g \
+				-e s"#ftp://\([^']*\).*#<a href='\0'>\0</a>#"g	\
+				-e s"#http://\([^']*\).*#<a href='\0'>\0</a>#"g ;;
+		receipt)
+			sed -e s"#^\#\([^']*\)#<span class='sh-comment'>\0</span>#"g \
+				-e s"#\"\([^']*\)\"#<span class='sh-val'>\0</span>#"g ;;
+	esac
 }
 
 # Latest build pkgs.
@@ -102,16 +106,20 @@
 					echo "<h3>Cook summary</h3>"
 					echo '<pre>'
 					grep -A 8 "^Summary " $LOGS/$pkg.log | sed /^$/d | \
-						syntax_highlighter
+						syntax_highlighter log
 					echo '</pre>'
 				fi
 			fi
-			if fgrep -q "ERROR:" $LOGS/$pkg.log; then
-				fgrep "ERROR:" $LOGS/$pkg.log
+			if fgrep -q "Debug " $LOGS/$pkg.log; then
+				echo "<h3>Cook failed</h3>"
+				echo '<pre>'
+				grep -A 8 "^Debug " $LOGS/$pkg.log | sed /^$/d | \
+						syntax_highlighter log
+				echo '</pre>'
 			fi
 			echo "<h3>Cook log</h3>"
 			echo '<pre>'
-			cat $log | syntax_highlighter
+			cat $log | syntax_highlighter log
 			echo '</pre>'
 		else
 			echo "<pre>No log: $pkg</pre>"
@@ -122,17 +130,17 @@
 		echo "<h2>Log for: $log</h2>"
 		if [ -f "$LOGS/$log.log" ]; then
 			echo '<pre>'
-			cat $file | syntax_highlighter
+			cat $file | syntax_highlighter log
 			echo '</pre>'
 		else
 			echo "<pre>No log for: $log</pre>"
 		fi ;;
 	receipt=*)
 		pkg=${QUERY_STRING#receipt=}
-		echo "<h2>Receipt: $pkg</h2>"
+		echo "<h2>Receipt for: $pkg</h2>"
 		if [ -f "$wok/$pkg/receipt" ]; then
 			echo '<pre>'
-			cat $wok/$pkg/receipt | syntax_highlighter
+			cat $wok/$pkg/receipt | syntax_highlighter receipt
 			echo '</pre>'
 		else
 			echo "<pre>No receipt for: $log</pre>"
diff -r dcf50aa1bb76 -r c3c30b1506b8 web/style.css
--- a/web/style.css	Thu May 05 17:05:19 2011 +0200
+++ b/web/style.css	Thu May 05 17:45:44 2011 +0200
@@ -36,4 +36,6 @@
 .span-sky { color: blue; }
 .span-no { color: orange; }
 .span-line { color: #888; }
-.span-date { color: #666; font-size: 95%; }
+.log-date { color: #666; font-size: 95%; }
+.sh-comment { color: #b20000; }
+.sh-val { color: #f35a00; }