# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1495891418 -10800
# Node ID c711ef2e51a9a2b2741d4cc865a739f1b20b4b0e
# Parent  d41948eec3e6289edf16ca5e6511b24e7d232375
cook: got separate {pre;post}_{install;remove} functions for every package; tweak copy(); lighttpd/index.cgi: fix links with '+' in activity log.

diff -r d41948eec3e6 -r c711ef2e51a9 cook
--- a/cook	Fri May 26 16:22:26 2017 +0300
+++ b/cook	Sat May 27 16:23:38 2017 +0300
@@ -845,12 +845,17 @@
 	[ -n "$DEPENDS" ] && echo "DEPENDS=\"$DEPENDS\"" | tr -ds '\t' ' '
 	[ -n "$PROVIDE" ] && echo "PROVIDE=\"$PROVIDE\""
 
-	# Extract {pre,post}_{install,remove} functions
+	# Extract {pre,post}_{install,remove} functions;
+	# post_install_gtk_() will be copied as post_install() for gtk+ package
+	#
+	# restricted name (gtk+ -> gtk_; acl-dev -> acl_dev)
+	rname=$(echo -n $PACKAGE | tr -c 'a-zA-Z0-9' '_')
 	for i in pre post; do
 		for j in install remove; do
-			if grep -q "^${i}_$j()" "$orig_receipt"; then
+			if grep -q "^${i}_${j}_$rname()" "$orig_receipt"; then
 				echo
-				sed "/^${i}_$j()/,/}/!d" "$orig_receipt"
+				sed "/^${i}_${j}_$rname()/,/}/!d" "$orig_receipt" | \
+				sed "s|^${i}_${j}_$rname()|${i}_${j}()|"
 			fi
 		done
 	done
@@ -1254,7 +1259,7 @@
 			@std)
 				# Copy "standard" files (all but "developer files", man pages, documentation, translations)
 				sed '/\.h$/d; /\.hxx$/d; /\.a$/d; /\.la$/d; /\.pc$/d; /bin\/.*-config$/d;
-					/\.m4$/d; /\.gir$/d; /\.typelib$/d; /\.vapi$/d; /\.deps$/d;
+					/\.m4$/d; /\.gir$/d; /\.typelib$/d; /\.vapi$/d; /\.deps$/d; /\.cmake$/d;
 					/\/include\//d;
 					/\/share\/man\//d; /\/share\/doc\//d; /\/share\/gtk-doc\//d; /\/share\/info\//d;
 					/\/share\/devhelp\//d; /\/share\/locale\//d;
@@ -1268,7 +1273,7 @@
 			@dev)
 				# Copy "developer files"
 				sed -n '/\.h$/p; /\.hxx$/p; /\.a$/p; /\.la$/p; /\.pc$/p; /bin\/.*-config$/p;
-					/\.m4$/p; /\.gir$/p; /\.typelib$/p; /\.vapi$/p; /\.deps$/p;
+					/\.m4$/p; /\.gir$/p; /\.typelib$/p; /\.vapi$/p; /\.deps$/p; /\.cmake$/p;
 					/\/include\//p;
 					' $filelist | \
 				while read j; do
diff -r d41948eec3e6 -r c711ef2e51a9 lighttpd/index.cgi
--- a/lighttpd/index.cgi	Fri May 26 16:22:26 2017 +0300
+++ b/lighttpd/index.cgi	Sat May 27 16:23:38 2017 +0300
@@ -707,7 +707,7 @@
 			[ "$list" == 'cooklist' ] && nb="- Packages: $(wc -l < $cooklist)"
 			echo '<section id="content2">'
 			echo "<h2>DB: $list $nb</h2>"
-			tac $CACHE/$list | sed 's|cooker.cgi?pkg=||;
+			tac $CACHE/$list | sed 's|cooker.cgi?pkg=||; s|%2B|+|g;
 				s|\[ Done|<span class="r c20">Done|;
 				s|\[ Failed|<span class="r c10">Failed|;
 				s| \]|</span>|' | mktable $list