# HG changeset patch # User Aleksej Bobylev # Date 1515546367 -7200 # Node ID ddfe8a9e3dbfb779b975d72e87b369a298d5221e # Parent ee2f3d4790a48182db1809b58d4afdf899a44f8e lighttpd/index.cgi: syntax_highlighter(): fix colorization for audacious and audacious-pluging logs; update all_names() from `cook` to display all available packages under [download] section. diff -r ee2f3d4790a4 -r ddfe8a9e3dbf lighttpd/index.cgi --- a/lighttpd/index.cgi Fri Dec 29 13:05:43 2017 +0000 +++ b/lighttpd/index.cgi Wed Jan 10 03:06:07 2018 +0200 @@ -550,14 +550,19 @@ \ -e "s|\[\([01]\)m\[3\([1-7]\)m||g; s|\[\([01]\);3\([1-7]\)m||g; + s|\[3\([1-7]\)m||g; s|\[\([01]\);0m||g; s|\[0m||g; s|\[m||g; - s|\[0;10m||g;" \ + s|\[0;10m||g; + s|\[K||g;" \ \ -e "s|\[9\([1-6]\)m||; s|\[39m||; - s|\[1m||g;" \ + #s|\[1m||g; + s|\[1m||g; s|(B||g; + s|\[m||g; + " \ -e "s!^|\(+.*\)!|\1!; s!^|\(-.*\)!|\1!; s!^|\(@@.*@@\)\$!|\1!;" @@ -769,14 +774,24 @@ # Return all the names of packages bundled in this receipt all_names() { - local split=" $SPLIT " - if [ "${split/ $PACKAGE /}" != "$split" ]; then + # Get package names from $SPLIT variable + local split=$(echo $SPLIT \ + | awk ' + BEGIN { RS = " "; FS = ":"; } + { print $1; }' \ + | tr '\n' ' ') + local split_space=" $split " + if ! head -n1 $WOK/$pkg/receipt | fgrep -q 'v2'; then + # For receipts v1: $SPLIT may present in the $WANTED package, + # but split packages have their own receipts + echo $PACKAGE + elif [ "${split_space/ $PACKAGE /}" != "$split_space" ]; then # $PACKAGE included somewhere in $SPLIT (probably in the end). # We should build packages in the order defined in the $SPLIT. - echo $SPLIT + echo $split else # We'll build the $PACKAGE, then all defined in the $SPLIT. - echo $PACKAGE $SPLIT + echo $PACKAGE $split fi }