cookutils rev 1057
cook: follow changed version in the "Summary"; lighttpd/index.cgi: follow changed version in the "[download]".
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri May 18 11:42:03 2018 +0300 (2018-05-18) |
parents | 96366a824c1e |
children | ea288d4f994f |
files | cook lighttpd/index.cgi |
line diff
1.1 --- a/cook Thu May 17 23:42:39 2018 +0300 1.2 +++ b/cook Fri May 18 11:42:03 2018 +0300 1.3 @@ -331,8 +331,11 @@ 1.4 separator - 1.5 pkgi=1 1.6 for i in $(all_names); do 1.7 + version=$(awk -F$'\t' -vpkg="$i" '{ 1.8 + if ($1 == pkg) {print $2; exit} 1.9 + }' "$PKGS/packages.info") 1.10 fs=$(du -sh $WOK/$pkg/taz/$i-$VERSION$EXTRAVERSION | awk '{print $1}') 1.11 - pkgname="$i-$VERSION$EXTRAVERSION$arch.tazpkg" 1.12 + pkgname="$i-$version$EXTRAVERSION$arch.tazpkg" 1.13 size=$(ls -lh $PKGS/$pkgname | awk '{print $5}') 1.14 files=$(wc -l < $WOK/$pkg/taz/$i-$VERSION$EXTRAVERSION/files.list) 1.15 printf "%2d : %7s : %10s : %5s : %s\n" "$pkgi" "$fs" "$size" "$files" "$pkgname"
2.1 --- a/lighttpd/index.cgi Thu May 17 23:42:39 2018 +0300 2.2 +++ b/lighttpd/index.cgi Fri May 18 11:42:03 2018 +0300 2.3 @@ -1970,9 +1970,10 @@ 2.4 if [ -d "$wok/$pkg/taz" ]; then 2.5 [ "$show" -eq 1 ] || files_header 2.6 2.7 + common_version=$VERSION 2.8 for i in $(all_names); do 2.9 - [ -e "$wok/$pkg/taz/$i-$VERSION$EXTRAVERSION/receipt" ] || continue 2.10 - . $wok/$pkg/taz/$i-$VERSION$EXTRAVERSION/receipt 2.11 + [ -e "$wok/$pkg/taz/$i-$common_version$EXTRAVERSION/receipt" ] || continue 2.12 + . $wok/$pkg/taz/$i-$common_version$EXTRAVERSION/receipt 2.13 2.14 for filename in "$PACKAGE-$VERSION$EXTRAVERSION.tazpkg" "$PACKAGE-$VERSION$EXTRAVERSION-$ARCH.tazpkg"; do 2.15 [ -f "$PKGS/$filename" ] &&