# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1457909789 -7200
# Node ID 9d0d7bf20e90c9802f05b857e693f2f9714d59d0
# Parent  22eaf700fab55b88d9245bbaafe763da97372a5f
tazlito: fix old busybox awk function: "%*x formats are not supported" (supported in current busybox 1.23.2); small fixes

diff -r 22eaf700fab5 -r 9d0d7bf20e90 modules/calc_sizes
--- a/modules/calc_sizes	Wed Feb 24 22:02:58 2016 +0200
+++ b/modules/calc_sizes	Mon Mar 14 00:56:29 2016 +0200
@@ -11,6 +11,8 @@
 # File $1/warn output: warnings about missing packages
 # TODO: use 'equivalent packages' rules
 
+#tokens dir flavor outfile lsdir rootfs_p rootfs_u rootcd_u errfile warnfile root pkgdb loop undigest repos arr pi h2b h i b2h b p mark_deps pkg localdepend localdepends pkgs sizes depends size_u size_p boot_u boot_p num_pkgs size_packed size_unpacked size_iso s
+
 BEGIN {
 	FS = "\t";
 	K = 1024; M = K * 1024; G = M * 1024;
@@ -53,7 +55,7 @@
 				pi = pkgdb "/packages.info";
 			else
 				pi = pkgdb "/undigest/" repos[i] "/packages.info";
-			if (!system("test -e "pi)) {
+			if (!system("test -e " pi)) {
 				ARGV[ARGC] = pi;
 				ARGC ++;
 			}
@@ -134,9 +136,9 @@
 
 	# Check critical packages: "syslinux" and one of the packages containing "vmlinuz*"
 	if (! pkgs["syslinux"]) printf "  * Syslinux\n" >> warnfile;
-	if (! pkgs["linux"]       && ! pkgs["linux-without-modules"] && \
-		! pkgs["linux64"]     && ! pkgs["linux64-without-modules"] && \
-		! pkgs["linux-libre"] && ! pkgs["linux-libre-without-modules"] && \
+	if (! pkgs["linux"]       && ! pkgs["linux-without-modules"] &&
+		! pkgs["linux64"]     && ! pkgs["linux64-without-modules"] &&
+		! pkgs["linux-libre"] && ! pkgs["linux-libre-without-modules"] &&
 		! pkgs["linux-uml"]) printf "  * Linux kernel\n" >> warnfile;
 
 	# Calculate unpacked and packed sizes of /boot
diff -r 22eaf700fab5 -r 9d0d7bf20e90 tazlito
--- a/tazlito	Wed Feb 24 22:02:58 2016 +0200
+++ b/tazlito	Mon Mar 14 00:56:29 2016 +0200
@@ -1356,10 +1356,9 @@
 
 	# Show list of mirrors
 	[ -f "$priority" ] && awk -vdb="$root$LOCALSTATE" '
-	function show(num, name, url,   pad, len) {
-		pad = "................................";
-		len = (32 - length(name));
-		printf " %-1.1d. %s%*.*s %-44.44s\n", num, name, len, len, pad, url;
+	function show(num, name, url,   pad) {
+		pad = substr("................................", 1, 32 - length(name));
+		printf " %-1.1d. %s%s %-44.44s\n", num, name, pad, url;
 	}
 	{
 		num++;
@@ -1372,7 +1371,7 @@
 		show(num, "main", url);
 	}' "$priority"
 
-	tazpkg recharge --quiet
+	tazpkg recharge --quiet >/dev/null
 }
 
 
@@ -2176,6 +2175,7 @@
 		# Misc checks
 		mkdir -p "$PACKAGES_REPOSITORY"
 		REPACK=$(yesorno 'Repack packages from rootfs?' 'n')
+		newline
 
 		# Mount CD-ROM to be able to repack boot-loader packages
 		if [ ! -e /boot -a -n "$CDROM" ]; then