# HG changeset patch # User Aleksej Bobylev # Date 1517046238 -7200 # Node ID 6943f5f9845ac984001f8c4084d80a5daf7c16c3 # Parent be4a05be1a6fc32cee31b47c6cc28cbe5893c9b1 cook: fix but while CONFIG_FILES wasn't added to generated receipt (thanks Ceel); lighttpd/index.cgi: show "Latest cook" listing with modern BusyBox too. diff -r be4a05be1a6f -r 6943f5f9845a cook --- a/cook Wed Jan 24 12:14:38 2018 +0200 +++ b/cook Sat Jan 27 11:43:58 2018 +0200 @@ -927,7 +927,7 @@ cd $taz action 'Copying "%s"...' 'receipt' - export PACKAGE DEPENDS PROVIDE SUGGESTED TAZPANEL_DAEMON TAGS CAT + export PACKAGE DEPENDS PROVIDE SUGGESTED TAZPANEL_DAEMON TAGS CAT CONFIG_FILES @@PREFIX@@/libexec/cookutils/mk_pkg_receipt "$(realpath ../receipt)" > $pack/receipt chown 0.0 $pack/receipt; status diff -r be4a05be1a6f -r 6943f5f9845a lighttpd/index.cgi --- a/lighttpd/index.cgi Wed Jan 24 12:14:38 2018 +0200 +++ b/lighttpd/index.cgi Sat Jan 27 11:43:58 2018 +0200 @@ -1048,13 +1048,34 @@ section $blocked 12 "Blocked|All blocked packages" cd $PKGS - ls -let *.tazpkg | awk ' - (NR<=20){ - sub(/:[0-9][0-9]$/, "", $9); - mon = index(" JanFebMarAprMayJunJulAugSepOctNovDec", $7) / 3; - printf("%d-%02d-%02d %s : %s\n", $10, mon, $8, $9, $11, $11); - }' | \ - section $activity 1000 "Latest cook" + # About BusyBox's `ls` + # On the Tank server: BusyBox v1.18.4 (2012-03-14 03:32:25 CET) multi-call binary. + # It supported the option `-e`, output with `-let` options is like this: + # -rw-r--r-- 1 user group 100000 Fri Nov 3 10:00:00 2017 filename + # 1 2 3 4 5 6 7 8 9 10 11 + # Newer BusyBox v1.27.2 don't support option `-e` and have no configs to + # configure it or return the option back. It supported the long option + # `--full-time` instead, but output is different: + # -rw-r--r-- 1 user group 100000 2017-11-03 10:00:00 +0200 filename + # 1 2 3 4 5 6 7 8 9 + if ls -let >/dev/null 2>&1; then + ls -let *.tazpkg \ + | awk ' + (NR<=20){ + sub(/:[0-9][0-9]$/, "", $9); + mon = index(" JanFebMarAprMayJunJulAugSepOctNovDec", $7) / 3; + printf("%d-%02d-%02d %s : %s\n", $10, mon, $8, $9, $11, $11); + }' \ + | section $activity 1000 "Latest cook" + else + ls -lt --full-time *.tazpkg \ + | awk ' + (NR<=20){ + sub(/:[0-9][0-9]$/, "", $7); + printf("%s %s : %s\n", $6, $7, $9, $9); + }' \ + | section $activity 1000 "Latest cook" + fi echo '' datalist