cookutils rev 804

Fix previous commit (`syntax_highlighter log` used not only for cooking logs)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Jul 03 11:17:49 2016 +0300 (2016-07-03)
parents 166a91b87ac8
children eb765a8c3872
files web/cooker.cgi
line diff
     1.1 --- a/web/cooker.cgi	Sat Jul 02 23:45:01 2016 +0300
     1.2 +++ b/web/cooker.cgi	Sun Jul 03 11:17:49 2016 +0300
     1.3 @@ -103,6 +103,11 @@
     1.4  syntax_highlighter() {
     1.5  	case $1 in
     1.6  		log)
     1.7 +			# If variables not defined - define them with some rare values
     1.8 +			: ${_src=#_#_#}
     1.9 +			: ${_install=#_#_#}
    1.10 +			: ${_fs=#_#_#}
    1.11 +			: ${_stuff=#_#_#}
    1.12  			sed	-e 's/&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g' \
    1.13  				-e 's#OK$#<span class="span-ok">OK</span>#g' \
    1.14  				-e 's#Done$#<span class="span-ok">Done</span>#g' \
    1.15 @@ -116,10 +121,10 @@
    1.16  				-e s"#^[a-zA-Z0-9]\([^']*\) :: #<span class='span-sky'>\0</span>#"g \
    1.17  				-e s"#ftp://[^ '\"]*#<a href='\0'>\0</a>#"g	\
    1.18  				-e s"#http://[^ '\"]*#<a href='\0'>\0</a>#"g | \
    1.19 -			sed "s|$src|<span class='var'>\${src}</span>|g;
    1.20 -				 s|$install|<span class='var'>\${install}</span>|g;
    1.21 -				 s|$fs|<span class='var'>\${fs}</span>|g;
    1.22 -				 s|$stuff|<span class='var'>\${stuff}</span>|g"
    1.23 +			sed "s|$_src|<span class='var'>\${src}</span>|g;
    1.24 +				 s|$_install|<span class='var'>\${install}</span>|g;
    1.25 +				 s|$_fs|<span class='var'>\${fs}</span>|g;
    1.26 +				 s|$_stuff|<span class='var'>\${stuff}</span>|g"
    1.27  				;;
    1.28  
    1.29  		receipt)
    1.30 @@ -216,10 +221,11 @@
    1.31  
    1.32  		# Define cook variables for syntax highlighter
    1.33  		. "$WOK/$pkg/receipt"
    1.34 -		src="$WOK/$pkg/source/$PACKAGE-$VERSION"
    1.35 -		install="$WOK/$pkg/install"
    1.36 -		fs="$WOK/$pkg/taz/$PACKAGE-$VERSION/fs"
    1.37 -		stuff="$WOK/$pkg/stuff"
    1.38 +		_wok='/home/slitaz/wok'
    1.39 +		_src="$_wok/$pkg/source/$PACKAGE-$VERSION"
    1.40 +		_install="$_wok/$pkg/install"
    1.41 +		_fs="$_wok/$pkg/taz/$PACKAGE-$VERSION/fs"
    1.42 +		_stuff="$_wok/$pkg/stuff"
    1.43  
    1.44  		# Package info.
    1.45  		echo '<div id="info">'