SliTaz Repositories

     1.1 --- a/cook	Mon Dec 12 21:40:00 2016 +0000
     1.2 +++ b/cook	Wed Dec 14 23:03:59 2016 +0200
     1.3 @@ -790,6 +790,28 @@
     1.4  }
     1.5  
     1.6  
     1.7 +# Remove files provided by splitted packages
     1.8 +# For example:
     1.9 +#   1. Package "pkg-main":
    1.10 +#      SPLIT="pkg-1 pkg-2 pkg-extra"
    1.11 +#   2. Package="pkg-extra":
    1.12 +#      WANTED="pkg-main"
    1.13 +#      BUILD_DEPENDS="pkg-1 pkg-2"
    1.14 +#      cook_copy_folders usr
    1.15 +#      cook_split_rm $BUILD_DEPENDS
    1.16 +
    1.17 +cook_split_rm() {
    1.18 +	for i in $@; do
    1.19 +		action 'Remove files provided by splitted package %s...' "$i"
    1.20 +		while read j; do
    1.21 +			[ -f "$fs$j" -o -h "$fs$j" ] && rm $fs$j
    1.22 +			rmdir "$(dirname "$fs$j")" 2>/dev/null
    1.23 +		done < $WOK/$i/taz/$i-$VERSION/files.list
    1.24 +		:; status
    1.25 +	done
    1.26 +}
    1.27 +
    1.28 +
    1.29  # Update installed.cook.diff
    1.30  
    1.31  update_installed_cook_diff() {

     2.1 --- a/doc/cookopts.txt	Mon Dec 12 21:40:00 2016 +0000
     2.2 +++ b/doc/cookopts.txt	Wed Dec 14 23:03:59 2016 +0200
     2.3 @@ -16,6 +16,7 @@
     2.4      The presence of this option overrides the default action (files will not be
     2.5      automatically copied).
     2.6  
     2.7 +!menus
     2.8      Default action is to copy desktop files from a /usr/share/applications
     2.9      folder (the same action that made obsolete option `GENERIC_MENUS="no"`).
    2.10      The presence of this option overrides the default action (files will not be

     3.1 --- a/web/cooker.cgi	Mon Dec 12 21:40:00 2016 +0000
     3.2 +++ b/web/cooker.cgi	Wed Dec 14 23:03:59 2016 +0200
     3.3 @@ -110,14 +110,14 @@
     3.4  #
     3.5  
     3.6  
     3.7 -# Unpack to stdout 
     3.8 +# Unpack to stdout
     3.9  
    3.10  docat() {
    3.11  	case "$1" in
    3.12 -	*gz) zcat ;;
    3.13 -	*bz2) bzcat ;;
    3.14 -	*xz) xzcat ;;
    3.15 -	*) cat
    3.16 +		*gz)   zcat ;;
    3.17 +		*bz2) bzcat ;;
    3.18 +		*xz)  xzcat ;;
    3.19 +		*)      cat
    3.20  	esac < $1
    3.21  }
    3.22  
    3.23 @@ -152,7 +152,7 @@
    3.24  			: ${_install=#_#_#}
    3.25  			: ${_fs=#_#_#}
    3.26  			: ${_stuff=#_#_#}
    3.27 -			sed	-e 's/&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g' \
    3.28 +			sed	-e 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g' \
    3.29  				-e 's#OK$#<span class="span-ok">OK</span>#g' \
    3.30  				-e 's#Done$#<span class="span-ok">Done</span>#g' \
    3.31  				-e 's#yes$#<span class="span-ok">yes</span>#g' \
    3.32 @@ -160,15 +160,22 @@
    3.33  				-e 's#error$#<span class="span-red">error</span>#g' \
    3.34  				-e 's#ERROR:#<span class="span-red">ERROR:</span>#g' \
    3.35  				-e 's#WARNING:#<span class="span-red">WARNING:</span>#g' \
    3.36 -				-e s"#^Executing:\([^']*\).#<span class='sh-val'>\0</span>#"g \
    3.37 -				-e s"#^====\([^']*\).#<span class='span-line'>\0</span>#"g \
    3.38 -				-e s"#^[a-zA-Z0-9]\([^']*\) :: #<span class='span-sky'>\0</span>#"g \
    3.39 -				-e s"#ftp://[^ '\"]*#<a href='\0'>\0</a>#"g	\
    3.40 -				-e s"#http://[^ '\"]*#<a href='\0'>\0</a>#"g | \
    3.41 -			sed "s|$_src|<span class='var'>\${src}</span>|g;
    3.42 -				 s|$_install|<span class='var'>\${install}</span>|g;
    3.43 -				 s|$_fs|<span class='var'>\${fs}</span>|g;
    3.44 -				 s|$_stuff|<span class='var'>\${stuff}</span>|g"
    3.45 +				-e "s#^Executing:\([^']*\).#<span class='sh-val'>\0</span>#g" \
    3.46 +				-e "s#^====\([^']*\).#<span class='span-line'>\0</span>#g" \
    3.47 +				-e "s#^[a-zA-Z0-9]\([^']*\) :: #<span class='span-sky'>\0</span>#g" \
    3.48 +				-e "s#ftp://[^ '\"]*#<a href='\0'>\0</a>#g" \
    3.49 +				-e "s#http://[^ '\"]*#<a href='\0'>\0</a>#g" \
    3.50 +				-e "s|$_src|<span class='var'>\${src}</span>|g;
    3.51 +					s|$_install|<span class='var'>\${install}</span>|g;
    3.52 +					s|$_fs|<span class='var'>\${fs}</span>|g;
    3.53 +					s|$_stuff|<span class='var'>\${stuff}</span>|g" \
    3.54 +				-e "s|\[91m|<span style='color: #F00'>|;
    3.55 +					s|\[92m|<span style='color: #080'>|;
    3.56 +					s|\[93m|<span style='color: #FF0'>|;
    3.57 +					s|\[94m|<span style='color: #00F'>|;
    3.58 +					s|\[95m|<span style='color: #808'>|;
    3.59 +					s|\[96m|<span style='color: #0CC'>|;
    3.60 +					s|\[39m|</span>|;"
    3.61  				;;
    3.62  
    3.63  		receipt)