cookutils rev 1005
(and again)
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Tue Nov 07 13:57:02 2017 +0200 (2017-11-07) |
parents | abb9bcf54d48 |
children | 553a90d99a5b |
files | lighttpd/index.cgi modules/mk_pkg_receipt |
line diff
1.1 --- a/lighttpd/index.cgi Tue Nov 07 10:46:21 2017 +0200 1.2 +++ b/lighttpd/index.cgi Tue Nov 07 13:57:02 2017 +0200 1.3 @@ -276,16 +276,9 @@ 1.4 1.5 if [ "$pkg" == 's' ]; then 1.6 # argument <pkg> is in $cmd variable 1.7 - 1.8 - # find main package 1.9 - main=$(awk -F$'\t' -vpkg=" $cmd " '{ 1.10 - if (index(" " $2 " ", pkg)) {print $1; exit} 1.11 - }' $splitdb) 1.12 - # get version 1.13 - ver="$(. $wok/$main/receipt; echo "$VERSION")" 1.14 - 1.15 echo -en "Content-Type: image/svg+xml\n\n<svg xmlns='http://www.w3.org/2000/svg' height='12' width='8'><path d='" 1.16 - if [ -e $PKGS/$cmd-$ver.tazpkg ]; then 1.17 + # packages.info updates with each new package, so we'll find actual info here 1.18 + if grep -q "^$cmd"$'\t' $PKGS/packages.info; then 1.19 echo "m1 2-1 1v8l1 1h6l1-1v-8l-1-1z' fill='#090'/></svg>" 1.20 else 1.21 echo "m0 3v8l1 1h6l1-1v-8l-1-1h-6zm3 0h2v5h-2zm0 6h2v2h-2z' fill='#d00'/></svg>"
2.1 --- a/modules/mk_pkg_receipt Tue Nov 07 10:46:21 2017 +0200 2.2 +++ b/modules/mk_pkg_receipt Tue Nov 07 13:57:02 2017 +0200 2.3 @@ -66,6 +66,9 @@ 2.4 2.5 PACKAGE="$PACKAGE" 2.6 VERSION="$VERSION" 2.7 +EOF 2.8 +[ -n "$EXTRAVERSION" ] && echo "EXTRAVERSION=\"$EXTRAVERSION\"" 2.9 +cat <<EOF 2.10 CATEGORY="$CATEGORY" 2.11 SHORT_DESC="$SHORT_DESC" 2.12 MAINTAINER="$MAINTAINER"