SliTaz Repositories

     1.1 --- a/web/cooker.cgi	Mon Nov 14 09:12:09 2016 +0100
     1.2 +++ b/web/cooker.cgi	Wed Dec 14 23:03:59 2016 +0200
     1.3 @@ -110,14 +110,14 @@
     1.4  #
     1.5  
     1.6  
     1.7 -# Unpack to stdout 
     1.8 +# Unpack to stdout
     1.9  
    1.10  docat() {
    1.11  	case "$1" in
    1.12 -	*gz) zcat ;;
    1.13 -	*bz2) bzcat ;;
    1.14 -	*xz) xzcat ;;
    1.15 -	*) cat
    1.16 +		*gz)   zcat ;;
    1.17 +		*bz2) bzcat ;;
    1.18 +		*xz)  xzcat ;;
    1.19 +		*)      cat
    1.20  	esac < $1
    1.21  }
    1.22  
    1.23 @@ -152,7 +152,7 @@
    1.24  			: ${_install=#_#_#}
    1.25  			: ${_fs=#_#_#}
    1.26  			: ${_stuff=#_#_#}
    1.27 -			sed	-e 's/&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g' \
    1.28 +			sed	-e 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g' \
    1.29  				-e 's#OK$#<span class="span-ok">OK</span>#g' \
    1.30  				-e 's#Done$#<span class="span-ok">Done</span>#g' \
    1.31  				-e 's#yes$#<span class="span-ok">yes</span>#g' \
    1.32 @@ -160,15 +160,22 @@
    1.33  				-e 's#error$#<span class="span-red">error</span>#g' \
    1.34  				-e 's#ERROR:#<span class="span-red">ERROR:</span>#g' \
    1.35  				-e 's#WARNING:#<span class="span-red">WARNING:</span>#g' \
    1.36 -				-e s"#^Executing:\([^']*\).#<span class='sh-val'>\0</span>#"g \
    1.37 -				-e s"#^====\([^']*\).#<span class='span-line'>\0</span>#"g \
    1.38 -				-e s"#^[a-zA-Z0-9]\([^']*\) :: #<span class='span-sky'>\0</span>#"g \
    1.39 -				-e s"#ftp://[^ '\"]*#<a href='\0'>\0</a>#"g	\
    1.40 -				-e s"#http://[^ '\"]*#<a href='\0'>\0</a>#"g | \
    1.41 -			sed "s|$_src|<span class='var'>\${src}</span>|g;
    1.42 -				 s|$_install|<span class='var'>\${install}</span>|g;
    1.43 -				 s|$_fs|<span class='var'>\${fs}</span>|g;
    1.44 -				 s|$_stuff|<span class='var'>\${stuff}</span>|g"
    1.45 +				-e "s#^Executing:\([^']*\).#<span class='sh-val'>\0</span>#g" \
    1.46 +				-e "s#^====\([^']*\).#<span class='span-line'>\0</span>#g" \
    1.47 +				-e "s#^[a-zA-Z0-9]\([^']*\) :: #<span class='span-sky'>\0</span>#g" \
    1.48 +				-e "s#ftp://[^ '\"]*#<a href='\0'>\0</a>#g" \
    1.49 +				-e "s#http://[^ '\"]*#<a href='\0'>\0</a>#g" \
    1.50 +				-e "s|$_src|<span class='var'>\${src}</span>|g;
    1.51 +					s|$_install|<span class='var'>\${install}</span>|g;
    1.52 +					s|$_fs|<span class='var'>\${fs}</span>|g;
    1.53 +					s|$_stuff|<span class='var'>\${stuff}</span>|g" \
    1.54 +				-e "s|\[91m|<span style='color: #F00'>|;
    1.55 +					s|\[92m|<span style='color: #080'>|;
    1.56 +					s|\[93m|<span style='color: #FF0'>|;
    1.57 +					s|\[94m|<span style='color: #00F'>|;
    1.58 +					s|\[95m|<span style='color: #808'>|;
    1.59 +					s|\[96m|<span style='color: #0CC'>|;
    1.60 +					s|\[39m|</span>|;"
    1.61  				;;
    1.62  
    1.63  		receipt)