# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1547212493 -7200
# Node ID 0385051c39962b6c916900048228980729ef5128
# Parent  b6def327b90a0ad38a38ea0dd2fbf1deb9bd5853
Tiny edits (cook pkgdb is far from finished yet...)

diff -r b6def327b90a -r 0385051c3996 lighttpd/cooker.css
--- a/lighttpd/cooker.css	Mon Jan 07 11:24:09 2019 +0200
+++ b/lighttpd/cooker.css	Fri Jan 11 15:14:53 2019 +0200
@@ -623,6 +623,7 @@
 	position: relative;
 	top: -1.6rem;
 }
+#webstat .meter { display: inline; visibility: hidden; } /* forever unfinished */
 
 
 
diff -r b6def327b90a -r 0385051c3996 modules/pack
--- a/modules/pack	Mon Jan 07 11:24:09 2019 +0200
+++ b/modules/pack	Fri Jan 11 15:14:53 2019 +0200
@@ -270,12 +270,12 @@
 	save="$(mktemp)"
 	# `$(echo ...)`: normalize whitespace (space, tab, newline and their
 	# combinations and repeats)
-	cat > $save <<EOT
-PACKAGE="$PACKAGE"; DEPENDS="$(echo $DEPENDS)"; PROVIDE="$(echo $PROVIDE)"
-SUGGESTED="$(echo $SUGGESTED)"; TAZPANEL_DAEMON="$TAZPANEL_DAEMON"
-TAGS="$(echo $TAGS)"; VERSION="$VERSION"; SHORT_DESC="$SHORT_DESC"
-WEB_SITE="$WEB_SITE"; CATEGORY="$CATEGORY"
-EOT
+	cat > $save <<-EOT
+		PACKAGE="$PACKAGE"; DEPENDS="$(echo $DEPENDS)"; PROVIDE="$(echo $PROVIDE)"
+		SUGGESTED="$(echo $SUGGESTED)"; TAZPANEL_DAEMON="$TAZPANEL_DAEMON"
+		TAGS="$(echo $TAGS)"; VERSION="$VERSION"; SHORT_DESC="$SHORT_DESC"
+		WEB_SITE="$WEB_SITE"; CATEGORY="$CATEGORY"
+	EOT
 	unset_receipt
 	. "$orig_receipt"
 	MAIN_PACKAGE="$PACKAGE"
diff -r b6def327b90a -r 0385051c3996 modules/pkgdb
--- a/modules/pkgdb	Mon Jan 07 11:24:09 2019 +0200
+++ b/modules/pkgdb	Fri Jan 11 15:14:53 2019 +0200
@@ -119,7 +119,8 @@
 _ 'Creating lists from "%s"' "$WOK" | dblog
 cd $WOK
 rsumf=$(mktemp)
-touch $dbs/packages.desc $dbs/packages.txt $dbs/packages.info $dbs/packages.equiv
+#touch $dbs/packages.desc $dbs/packages.txt $dbs/packages.info $dbs/packages.equiv
+touch $dbs/packages.info $dbs/packages.equiv
 for i in *; do
 	[ -d "$WOK/$i/taz" ] || continue
 
@@ -127,39 +128,44 @@
 		pack="$i/taz/$j"
 		[ -f "$WOK/$pack/receipt" ] || continue
 		unset_receipt
+		unset PACKED_SIZE UNPACKED_SIZE RSUM PACKAGE VERSION EXTRAVERSION CATEGORY SHORT_DESC MAINTAINER LICENSE WEB_SITE DEPENDS TAGS PROVIDE
 		. ./$pack/receipt
 
-		if [ -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION$arch.tazpkg" ]; then
+		if [ -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION-$ARCH.tazpkg" -o -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION-any.tazpkg"]; then
 
-			# packages.desc lets us search easily in DB
-			cat >> $dbs/packages.desc <<EOT
-$PACKAGE | $VERSION$EXTRAVERSION | $SHORT_DESC | $CATEGORY | $WEB_SITE
-EOT
-
-			# packages.txt used by tazpkg-web also to provide
-			# a human readable package list with version and description.
-			cat >> $dbs/packages.txt <<EOT
-$PACKAGE
-$VERSION$EXTRAVERSION
-$SHORT_DESC
-$PACKED_SIZE ($UNPACKED_SIZE installed)
-
-EOT
+#			# packages.desc lets us search easily in DB
+#			cat >> $dbs/packages.desc <<-EOT
+#				$PACKAGE | $VERSION$EXTRAVERSION | $SHORT_DESC | $CATEGORY | $WEB_SITE
+#			EOT
+#
+#			# packages.txt used by tazpkg-web also to provide
+#			# a human readable package list with version and description.
+#			cat >> $dbs/packages.txt <<-EOT
+#				$PACKAGE
+#				$VERSION$EXTRAVERSION
+#				$SHORT_DESC
+#				$PACKED_SIZE ($UNPACKED_SIZE installed)
+#
+#			EOT
 
 			# packages.info combines TazPkg separate files
 			# and will substitute them all
 			SIZES=$(echo $PACKED_SIZE $UNPACKED_SIZE | sed 's|\.0||g')
 			DEPENDS=$(echo $DEPENDS) # remove newlines from some receipts
 
-			#MD5="$(fgrep " $PACKAGE-$VERSION$EXTRAVERSION.tazpkg" $PKGS/packages.md5 | awk '{print $1}')"
-			cp $pack/md5sum $rsumf
-			md5sum $pack/receipt | sed 's| [^ ]*/| |' >> $rsumf
-			[ -e "$pack/description.txt" ] && md5sum $pack/description.txt | sed 's| [^ ]*/| |' >> $rsumf
-			rsum=$(md5sum $rsumf | awk '{print $1}')
+#			#MD5="$(fgrep " $PACKAGE-$VERSION$EXTRAVERSION.tazpkg" $PKGS/packages.md5 | awk '{print $1}')"
 
-			cat >> $dbs/packages.info <<EOT
-$PACKAGE	$VERSION$EXTRAVERSION	$CATEGORY	$SHORT_DESC	$WEB_SITE	$TAGS	$SIZES	$DEPENDS	$rsum	$PROVIDE
-EOT
+			# RSUM defined in new "small" receipts, but may be absent in old
+			if [ -z "$RSUM" ]; then
+				cp $pack/md5sum $rsumf
+				md5sum $pack/receipt | sed 's| [^ ]*/| |' >> $rsumf
+				[ -e "$pack/description.txt" ] && md5sum $pack/description.txt | sed 's| [^ ]*/| |' >> $rsumf
+				RSUM=$(md5sum $rsumf | awk '{print $1}')
+			fi
+
+			cat >> $dbs/packages.info <<-EOT
+				$PACKAGE	$VERSION$EXTRAVERSION	$CATEGORY	$SHORT_DESC	$WEB_SITE	$TAGS	$SIZES	$DEPENDS	$RSUM	$PROVIDE
+			EOT
 
 			# packages.equiv is used by tazpkg install to check depends.
 			for k in $PROVIDE; do
@@ -264,6 +270,7 @@
 { _ 'Packages: %s - Time: %ss' "$nb" "$time"; newline; } | dblog
 
 # "Atomic" update now
+ls -l $dbs
 cp -f $dbs/* $PKGS
 rm -r $dbs
 
diff -r b6def327b90a -r 0385051c3996 modules/postcheck
--- a/modules/postcheck	Mon Jan 07 11:24:09 2019 +0200
+++ b/modules/postcheck	Fri Jan 11 15:14:53 2019 +0200
@@ -262,7 +262,7 @@
 		if [ "$result" == 'bad' ]; then
 			echo "  Problems found:"
 			for i in $bad_sl; do
-				stat -c '  %N'
+				stat -c '  %N' $i
 			done
 		fi
 		unset IFS