# HG changeset patch # User Aleksej Bobylev # Date 1517585529 -7200 # Node ID dc1a0fbc8d28de9924ab7b15a09752344a9121f9 # Parent 01fbe9d46cb49afc6856381daaf14e0a5e73d9be lighttpd/index.cgi: sort packages on the tag page, misc tiny edits diff -r 01fbe9d46cb4 -r dc1a0fbc8d28 lighttpd/index.cgi --- a/lighttpd/index.cgi Fri Feb 02 01:15:45 2018 +0200 +++ b/lighttpd/index.cgi Fri Feb 02 17:32:09 2018 +0200 @@ -78,17 +78,20 @@ # HTML page header page_header() { - local theme t='' css pretitle='' cmd + local theme t='' css pretitle='' command theme=$(COOKIE theme) [ "$theme" == 'default' ] && theme='' [ -n "$theme" ] && theme="-$theme" css="cooker$theme.css" if [ -n "$pkg" ]; then - pretitle="$pkg - " + case "$pkg" in + ~) pretitle="Tag \"$cmd\" - ";; + *) pretitle="$pkg - ";; + esac else - cmd="$(cat $command)" - [ -n "$cmd" ] && pretitle="$cmd - " + command="$(cat $command)" + [ -n "$command" ] && pretitle="$command - " fi echo -e 'Content-Type: text/html; charset=UTF-8\n' @@ -1102,14 +1105,16 @@ EOT - awk -F$'\t' -vtag=" $tag " -vbase="$base" '{ + sort $PKGS/packages.info \ + | awk -F$'\t' -vtag=" $tag " -vbase="$base" '{ if (index(" " $6 " ", tag)) { url = base "/" $1 "/"; gsub("+", "%2B", url); - printf("%s%s%s\n", url, $1, $4, $3); + printf(" ", base, $1); + printf("%s%s%s\n", url, $1, $4, $3); } - }' $PKGS/packages.info - echo '' + }' + echo '' page_footer exit 0 fi