cookutils rev 601

cooker.cgi: unhtmlize description.txt
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Jul 05 16:31:41 2013 +0200 (2013-07-05)
parents cc087b6b3690
children 63ab72f9c816
files web/cooker.cgi
line diff
     1.1 --- a/web/cooker.cgi	Fri Jun 21 11:35:38 2013 +0200
     1.2 +++ b/web/cooker.cgi	Fri Jul 05 16:31:41 2013 +0200
     1.3 @@ -70,7 +70,8 @@
     1.4  syntax_highlighter() {
     1.5  	case $1 in
     1.6  		log)
     1.7 -			sed	-e 's#OK$#<span class="span-ok">OK</span>#g' \
     1.8 +			sed	-e 's/&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g' \
     1.9 +				-e 's#OK$#<span class="span-ok">OK</span>#g' \
    1.10  				-e 's#Done$#<span class="span-ok">Done</span>#g' \
    1.11  				-e 's#yes$#<span class="span-ok">yes</span>#g' \
    1.12  				-e 's#no$#<span class="span-no">no</span>#g' \
    1.13 @@ -83,7 +84,8 @@
    1.14  				-e s"#ftp://[^ '\"]*#<a href='\0'>\0</a>#"g	\
    1.15  				-e s"#http://[^ '\"]*#<a href='\0'>\0</a>#"g ;;
    1.16  		receipt)
    1.17 -			sed -e s'|&|\&amp;|g' -e 's|<|\&lt;|g' -e 's|>|\&gt;|'g \
    1.18 +			sed	-e 's/&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g' \
    1.19 +				-e s'|&|\&amp;|g' -e 's|<|\&lt;|g' -e 's|>|\&gt;|'g \
    1.20  				-e s"#^\#\([^']*\)#<span class='sh-comment'>\0</span>#"g \
    1.21  				-e s"#\"\([^']*\)\"#<span class='sh-val'>\0</span>#"g ;;
    1.22  		diff)
    1.23 @@ -190,8 +192,7 @@
    1.24  			fi
    1.25  			echo "<h3>Cook log</h3>"
    1.26  			echo '<pre>'
    1.27 -			cat $log | sed 's/&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g' |\
    1.28 -				syntax_highlighter log
    1.29 +			cat $log | syntax_highlighter log
    1.30  			echo '</pre>'
    1.31  		else
    1.32  			echo "<pre>No log: $pkg</pre>"
    1.33 @@ -245,7 +246,7 @@
    1.34  		file=${QUERY_STRING#stuff=}
    1.35  		echo "<h2>$file</h2>"
    1.36  		echo '<pre>'
    1.37 -		cat $wok/$file
    1.38 +		cat $wok/$file | sed 's/&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'
    1.39  		echo '</pre>' ;;
    1.40  	receipt=*)
    1.41  		pkg=${QUERY_STRING#receipt=}
    1.42 @@ -256,7 +257,8 @@
    1.43  				echo "<a href=\"?stuff=$pkg/$file\">$file</a>"
    1.44  			done
    1.45  			echo '<pre>'
    1.46 -			cat $wok/$pkg/receipt | syntax_highlighter receipt
    1.47 +			cat $wok/$pkg/receipt | \
    1.48 +				syntax_highlighter receipt
    1.49  			echo '</pre>'
    1.50  		else
    1.51  			echo "<pre>No receipt for: $pkg</pre>"
    1.52 @@ -280,7 +282,8 @@
    1.53  		dir=$(ls -d $WOK/$pkg/taz/$pkg-*)
    1.54  		if [ -s "$dir/description.txt" ]; then
    1.55  			echo '<pre>'
    1.56 -			cat $dir/description.txt
    1.57 +			cat $dir/description.txt | \
    1.58 +				sed 's/&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'
    1.59  			echo '</pre>'
    1.60  		else
    1.61  			echo "<pre>No description for: $pkg</pre>"