cookutils diff modules/mk_pkg_receipt @ rev 1078

cook: allow multi-set & no-src receipts (sources may be downloaded inside compile_rules() individually for each set), allow change SHORT_DESC & WEB_SITE in genpkg_rules() (for differents sets);
lighttpd/cooker.css: add style for log line "Switching to the set...";
lighttpd/index.cgi: remove false-positive coloring with word "fatal", mark line "Switching to the set...", don't hide "Logs" button (fresh log initially empty and it may lasts for many seconds due to buffered "lazy write";
modules/compressor: better remove unwanted Perl files;
modules/mk_pkg_receipt: follow changed SHORT_DESC & WEB_SITE, improve condition speed (from 10 sec to 0.01 sec) when SPLIT is relatively long - looks like ${A/ $B /} is slow.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Jun 21 12:57:52 2018 +0300 (2018-06-21)
parents 96366a824c1e
children 64c16be1dda4
line diff
     1.1 --- a/modules/mk_pkg_receipt	Thu May 17 23:42:39 2018 +0300
     1.2 +++ b/modules/mk_pkg_receipt	Thu Jun 21 12:57:52 2018 +0300
     1.3 @@ -38,7 +38,8 @@
     1.4  cat > $save <<EOT
     1.5  PACKAGE="$PACKAGE"; DEPENDS="$(echo $DEPENDS)"; PROVIDE="$(echo $PROVIDE)"
     1.6  SUGGESTED="$(echo $SUGGESTED)"; TAZPANEL_DAEMON="$TAZPANEL_DAEMON"
     1.7 -TAGS="$(echo $TAGS)"; VERSION="$VERSION"
     1.8 +TAGS="$(echo $TAGS)"; VERSION="$VERSION"; SHORT_DESC="$SHORT_DESC"
     1.9 +WEB_SITE="$WEB_SITE"
    1.10  EOT
    1.11  unset_receipt
    1.12  . "$orig_receipt"
    1.13 @@ -47,9 +48,8 @@
    1.14  
    1.15  # Manage split packages
    1.16  SPLIT=" $SPLIT "
    1.17 -if [ "$PACKAGE"             != "$MAIN_PACKAGE" -a \
    1.18 -	 "$SPLIT"               != '  '            -a \
    1.19 -	 "${SPLIT/ $PACKAGE /}" != "$SPLIT" ]; then
    1.20 +if [ "$PACKAGE" != "$MAIN_PACKAGE"   -a   "$SPLIT" != '  ' ] &&
    1.21 +	echo "$SPLIT" | fgrep -q " $PACKAGE "; then
    1.22  	# For packages with empty $DEPENDS
    1.23  	if [ -z "$DEPENDS" ]; then
    1.24  		case $PACKAGE in