# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1481749439 -7200
# Node ID cc73035433abdc47e5a0464809beb38c6d3f704b
# Parent  30c6b6064a50fc2a0049f6a4913b05e63a9e2927
cook: add cook_split_rm(); web/cooker.cgi: visualize console colorizations (existed in the bash log)

diff -r 30c6b6064a50 -r cc73035433ab cook
--- a/cook	Mon Dec 12 21:40:00 2016 +0000
+++ b/cook	Wed Dec 14 23:03:59 2016 +0200
@@ -790,6 +790,28 @@
 }
 
 
+# Remove files provided by splitted packages
+# For example:
+#   1. Package "pkg-main":
+#      SPLIT="pkg-1 pkg-2 pkg-extra"
+#   2. Package="pkg-extra":
+#      WANTED="pkg-main"
+#      BUILD_DEPENDS="pkg-1 pkg-2"
+#      cook_copy_folders usr
+#      cook_split_rm $BUILD_DEPENDS
+
+cook_split_rm() {
+	for i in $@; do
+		action 'Remove files provided by splitted package %s...' "$i"
+		while read j; do
+			[ -f "$fs$j" -o -h "$fs$j" ] && rm $fs$j
+			rmdir "$(dirname "$fs$j")" 2>/dev/null
+		done < $WOK/$i/taz/$i-$VERSION/files.list
+		:; status
+	done
+}
+
+
 # Update installed.cook.diff
 
 update_installed_cook_diff() {
diff -r 30c6b6064a50 -r cc73035433ab doc/cookopts.txt
--- a/doc/cookopts.txt	Mon Dec 12 21:40:00 2016 +0000
+++ b/doc/cookopts.txt	Wed Dec 14 23:03:59 2016 +0200
@@ -16,6 +16,7 @@
     The presence of this option overrides the default action (files will not be
     automatically copied).
 
+!menus
     Default action is to copy desktop files from a /usr/share/applications
     folder (the same action that made obsolete option `GENERIC_MENUS="no"`).
     The presence of this option overrides the default action (files will not be
diff -r 30c6b6064a50 -r cc73035433ab web/cooker.cgi
--- a/web/cooker.cgi	Mon Dec 12 21:40:00 2016 +0000
+++ b/web/cooker.cgi	Wed Dec 14 23:03:59 2016 +0200
@@ -110,14 +110,14 @@
 #
 
 
-# Unpack to stdout 
+# Unpack to stdout
 
 docat() {
 	case "$1" in
-	*gz) zcat ;;
-	*bz2) bzcat ;;
-	*xz) xzcat ;;
-	*) cat
+		*gz)   zcat ;;
+		*bz2) bzcat ;;
+		*xz)  xzcat ;;
+		*)      cat
 	esac < $1
 }
 
@@ -152,7 +152,7 @@
 			: ${_install=#_#_#}
 			: ${_fs=#_#_#}
 			: ${_stuff=#_#_#}
-			sed	-e 's/&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g' \
+			sed	-e 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g' \
 				-e 's#OK$#<span class="span-ok">OK</span>#g' \
 				-e 's#Done$#<span class="span-ok">Done</span>#g' \
 				-e 's#yes$#<span class="span-ok">yes</span>#g' \
@@ -160,15 +160,22 @@
 				-e 's#error$#<span class="span-red">error</span>#g' \
 				-e 's#ERROR:#<span class="span-red">ERROR:</span>#g' \
 				-e 's#WARNING:#<span class="span-red">WARNING:</span>#g' \
-				-e s"#^Executing:\([^']*\).#<span class='sh-val'>\0</span>#"g \
-				-e s"#^====\([^']*\).#<span class='span-line'>\0</span>#"g \
-				-e s"#^[a-zA-Z0-9]\([^']*\) :: #<span class='span-sky'>\0</span>#"g \
-				-e s"#ftp://[^ '\"]*#<a href='\0'>\0</a>#"g	\
-				-e s"#http://[^ '\"]*#<a href='\0'>\0</a>#"g | \
-			sed "s|$_src|<span class='var'>\${src}</span>|g;
-				 s|$_install|<span class='var'>\${install}</span>|g;
-				 s|$_fs|<span class='var'>\${fs}</span>|g;
-				 s|$_stuff|<span class='var'>\${stuff}</span>|g"
+				-e "s#^Executing:\([^']*\).#<span class='sh-val'>\0</span>#g" \
+				-e "s#^====\([^']*\).#<span class='span-line'>\0</span>#g" \
+				-e "s#^[a-zA-Z0-9]\([^']*\) :: #<span class='span-sky'>\0</span>#g" \
+				-e "s#ftp://[^ '\"]*#<a href='\0'>\0</a>#g" \
+				-e "s#http://[^ '\"]*#<a href='\0'>\0</a>#g" \
+				-e "s|$_src|<span class='var'>\${src}</span>|g;
+					s|$_install|<span class='var'>\${install}</span>|g;
+					s|$_fs|<span class='var'>\${fs}</span>|g;
+					s|$_stuff|<span class='var'>\${stuff}</span>|g" \
+				-e "s|\[91m|<span style='color: #F00'>|;
+					s|\[92m|<span style='color: #080'>|;
+					s|\[93m|<span style='color: #FF0'>|;
+					s|\[94m|<span style='color: #00F'>|;
+					s|\[95m|<span style='color: #808'>|;
+					s|\[96m|<span style='color: #0CC'>|;
+					s|\[39m|</span>|;"
 				;;
 
 		receipt)