cookutils rev 1002

cook: export CAT for mk_pkg_receipt; lighttpd/index.cgi: rename man2html to man2html.bin for package man2html availability, prepend diff output with vertical bar, improve coloring.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Nov 06 02:53:05 2017 +0200 (2017-11-06)
parents 41cc599aa328
children 75b330dd2734
files cook lighttpd/index.cgi modules/compressor
line diff
     1.1 --- a/cook	Sat Nov 04 18:02:07 2017 +0200
     1.2 +++ b/cook	Mon Nov 06 02:53:05 2017 +0200
     1.3 @@ -901,7 +901,7 @@
     1.4  
     1.5  	cd $taz
     1.6  	action 'Copying "%s"...' 'receipt'
     1.7 -	export PACKAGE DEPENDS PROVIDE SUGGESTED TAZPANEL_DAEMON TAGS
     1.8 +	export PACKAGE DEPENDS PROVIDE SUGGESTED TAZPANEL_DAEMON TAGS CAT
     1.9  	@@PREFIX@@/libexec/cookutils/mk_pkg_receipt "$(realpath ../receipt)" > $pack/receipt
    1.10  	chown 0.0 $pack/receipt; status
    1.11  
     2.1 --- a/lighttpd/index.cgi	Sat Nov 04 18:02:07 2017 +0200
     2.2 +++ b/lighttpd/index.cgi	Mon Nov 06 02:53:05 2017 +0200
     2.3 @@ -480,7 +480,8 @@
     2.4  			: ${_stuff=#_#_#}
     2.5  			# Use one-letter html tags to save some bytes :)
     2.6  			# <b>is error (red)</b> <u>is warning (orange)</u> <i>is informative (green)</i>
     2.7 -			sed	-e 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g' \
     2.8 +			sed	\
     2.9 +				-e 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g' \
    2.10  				-e 's#OK$#<i>OK</i>#' \
    2.11  				-e 's#\([Dd]one\)$#<i>\1</i>#' \
    2.12  				-e 's#Success$#<i>Success</i>#' \
    2.13 @@ -546,11 +547,19 @@
    2.14  					s|$_install|<var>\${install}</var>|g;
    2.15  					s|$_fs|<var>\${fs}</var>|g;
    2.16  					s|$_stuff|<var>\${stuff}</var>|g" \
    2.17 +				\
    2.18 +				-e "s|\[\([01]\);3\([1-7]\)m|<span class='c\2\1'>|g;
    2.19 +					s|\[\([01]\);0m|<span class='c0\1'>|g;
    2.20 +					s|\[0m|</span>|g;" \
    2.21 +				\
    2.22  				-e "s|\[9\([1-6]\)m|<span class='c\10'>|;
    2.23  					s|\[39m|</span>|;
    2.24  					s|\[1m|<strong>|g; s|\[0m|</strong>|g" \
    2.25 -				-e "s|^+.*|<i>\0</i>|;
    2.26 -					s|^-.*|<b>\0</b>|; /----/s|</*b>||; /^<b>--[^-]/s|</*b>||;"
    2.27 +				-e "s!^|\(+.*\)!|<span class='c20'>\1</span>!;
    2.28 +					s!^|\(-.*\)!|<span class='c10'>\1</span>!;
    2.29 +					s!^|\(@@.*@@\)\$!|<span class='c30'>\1</span>!;"
    2.30 +				\
    2.31 +
    2.32  			;;
    2.33  
    2.34  		files)
    2.35 @@ -692,7 +701,7 @@
    2.36  
    2.37  	echo "<a class='button icon browse' href='$base/$pkg/browse/'>browse</a>"
    2.38  
    2.39 -	[ -x ./man2html -a -d "$wok/$pkg/install/usr/share/man" ] &&
    2.40 +	[ -x ./man2html.bin -a -d "$wok/$pkg/install/usr/share/man" ] &&
    2.41  		echo "<a class='button icon doc$(active man)' href='$base/$pkg/man/'>man</a>"
    2.42  
    2.43  	[ -d "$wok/$pkg/install/usr/share/doc" -o -d "$wok/$pkg/install/usr/share/gtk-doc" ] &&
    2.44 @@ -1601,7 +1610,7 @@
    2.45  					#export TEXTDOMAIN='man2html'
    2.46  					echo "<div id='content2'>"
    2.47  
    2.48 -					html=$(./man2html "$tmp" | sed -e '1,/<header>/d' -e '/<footer>/,$d' \
    2.49 +					html=$(./man2html.bin "$tmp" | sed -e '1,/<header>/d' -e '/<footer>/,$d' \
    2.50  					-e 's|<a href="file:///[^>]*>\([^<]*\)</a>|\1|g' \
    2.51  					-e 's|<a href="?[1-9]\+[^>]*>\([^<]*\)</a>|\1|g')
    2.52  
     3.1 --- a/modules/compressor	Sat Nov 04 18:02:07 2017 +0200
     3.2 +++ b/modules/compressor	Mon Nov 06 02:53:05 2017 +0200
     3.3 @@ -423,7 +423,7 @@
     3.4  		if [ -n "$QA" ]; then
     3.5  			# Check the rest of errors, warnings and tips
     3.6  			_ 'QA: Checking %s...' "$(basename $desktop)"
     3.7 -			busybox diff "$desktop.orig" "$desktop"
     3.8 +			busybox diff "$desktop.orig" "$desktop" | sed 's!^!|!'
     3.9  			desktop-file-validate "$desktop" | busybox fold -s
    3.10  			echo
    3.11  		fi