# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1636459423 0
# Node ID 03544b89ac8193ca0c274fe5e5fb6b50d7337779
# Parent  d2c123d1284a126140964a54623936dbdd7a2103
misc typos

diff -r d2c123d1284a -r 03544b89ac81 modules/convert
--- a/modules/convert	Thu Sep 24 07:50:22 2020 +0100
+++ b/modules/convert	Tue Nov 09 12:03:43 2021 +0000
@@ -352,7 +352,7 @@
 	unsquashfs "$PACKAGE_FILE"
 	mv squashfs-root fs
 	set -- $(cat fs/pet.specs)
-	desc="$10"
+	desc="${10}"
 	finish_convert_puppy
 }
 
diff -r d2c123d1284a -r 03544b89ac81 modules/flavor
--- a/modules/flavor	Thu Sep 24 07:50:22 2020 +0100
+++ b/modules/flavor	Tue Nov 09 12:03:43 2021 +0000
@@ -19,9 +19,9 @@
 	case "$1" in
 		# Mirror URL can have a trailing slash or not.
 		http://* | https://* | ftp://*)
-			wget -c -q -T 30 -U $UA ${1%/}/$2 2>/dev/null && break ;;
+			wget -c -q -T 30 -U $UA ${1%/}/$2 2>/dev/null && return ;;
 		*)
-			ln -sf ${1%/}/$2 . && break ;;
+			ln -sf ${1%/}/$2 . && return ;;
 	esac
 }
 
diff -r d2c123d1284a -r 03544b89ac81 modules/getenv
--- a/modules/getenv	Thu Sep 24 07:50:22 2020 +0100
+++ b/modules/getenv	Tue Nov 09 12:03:43 2021 +0000
@@ -11,7 +11,7 @@
 	du egrep fgrep find grep gzip head httpd id ln ls lzcat md5sum mkdir mktemp mv readlink \
 	realpath rm rmdir rpm rpm2cpio sed sort stat su tac tail tar tee touch tr tty uniq unlzma wc \
 	wget which xzcat zcat; do
-	alias $i="busybox $i"
+	eval alias $i="busybox $i"
 done
 
 
diff -r d2c123d1284a -r 03544b89ac81 modules/help
--- a/modules/help	Thu Sep 24 07:50:22 2020 +0100
+++ b/modules/help	Tue Nov 09 12:03:43 2021 +0000
@@ -109,7 +109,7 @@
 :upgrade,up::setup-mirror,sm::add-undigest,setup-undigest::list-undigest:\
 :remove-undigest:"
 
-if [ ! $(echo $commands | grep -e "[:,]$T[:,]") ]; then
+if ! echo $commands | grep -qe "[:,]$T[:,]"; then
 	try1=$(echo $commands | grep -oe ":[^:]*$T[^:]*:")
 	if [ -z "$try1" ]; then
 		_ 'Sorry, no help for "%s"' "$QUERY"; newline; exit 0
@@ -171,7 +171,7 @@
 
 PRE2=$(echo "$OPT0" | sed "s|$OPTA|$OPTB|" | tr '@' '\n' | sed '/O/d; s|L||')
 
-[ ! -z "$TA" ] && T="$T, $TA"
+[ -n "$TA" ] && T="$T, $TA"
 
 title '%s' "$title"
 emsg "$(longline "$PRE2" | sed 's|A|<c 33>|g; s|B|<c 36>|g; s|C|</b>|g; s|D|</c>|g; ')"
diff -r d2c123d1284a -r 03544b89ac81 modules/info
--- a/modules/info	Thu Sep 24 07:50:22 2020 +0100
+++ b/modules/info	Tue Nov 09 12:03:43 2021 +0000
@@ -33,15 +33,15 @@
 	. "$INSTALLED/$1/receipt"
 	STATE=$(_ 'installed package')
 
-	if [ -e "$PKGS_DB/packages.info" ]; then
+	if [ -s "$PKGS_DB/packages.info" ]; then
 		# Check if upgrade available
 		NEWVER=$(awk -F$'\t' -vp="$1" '$1==p{print $2}' "$PKGS_DB/packages.info")
-		if [ "$VERSION" != "$NEWVER" ]; then
+		if [ "$VERSION" != "${NEWVER:-$VERSION}" ]; then
 			VERSION="$VERSION $(_n '(new version "%s" available)' "$NEWVER")"
 		else
 			OLDMD5=$(awk -F$'\t' -vp="$1" '$1==p{print $9}' "$PKGS_DB/installed.info")
 			NEWMD5=$(awk -F$'\t' -vp="$1" '$1==p{print $9}' "$PKGS_DB/packages.info")
-			if [ "$OLDMD5" != "$NEWMD5" ]; then
+			if [ "$OLDMD5" != "${NEWMD5:-$OLDMD5}" ]; then
 				VERSION="$VERSION $(_n '(new build available)')"
 			fi
 		fi
diff -r d2c123d1284a -r 03544b89ac81 modules/list
--- a/modules/list	Thu Sep 24 07:50:22 2020 +0100
+++ b/modules/list	Tue Nov 09 12:03:43 2021 +0000
@@ -290,7 +290,7 @@
 					done
 				fi
 				[ -n "$SUGGESTED" ] && cat <<EOT
-$(boldify $(echo "$PACKAGE"):) $SUGGESTED
+$(boldify ${PACKAGE}:) $SUGGESTED
 EOT
 			fi
 		done
diff -r d2c123d1284a -r 03544b89ac81 modules/mkdb
--- a/modules/mkdb	Thu Sep 24 07:50:22 2020 +0100
+++ b/modules/mkdb	Tue Nov 09 12:03:43 2021 +0000
@@ -180,7 +180,7 @@
 		cpio -F "$folder/$pkgfile" -i description.txt >/dev/null 2>&1
 		# Append descriptions DB
 		echo "$PACKAGE" >> "$DBd"
-		cat description.txt | sed 's|^$| |' >> "$DBd"
+		sed 's|^$| |' < description.txt >> "$DBd"
 		echo >> "$DBd"
 		rm description.txt
 	fi
diff -r d2c123d1284a -r 03544b89ac81 oldstuff/libtazpkgbox
--- a/oldstuff/libtazpkgbox	Thu Sep 24 07:50:22 2020 +0100
+++ b/oldstuff/libtazpkgbox	Tue Nov 09 12:03:43 2021 +0000
@@ -605,7 +605,7 @@
 			SHORT_DESC=`echo "$RES" | cut -d "|" -f 3`
 			CATEGORY=`echo "$RES" | cut -d "|" -f 4`
 			WEB_SITE=`echo "$RES" | cut -d "|" -f 5`
-			SIZES=`grep -sh -A 3 "^$(echo $PACKAGE)$" /var/lib/tazpkg/packages.txt \
+			SIZES=`grep -sh -A 3 "^${PACKAGE}$" /var/lib/tazpkg/packages.txt \
 				/var/lib/tazpkg/undigest/*/packages.txt | tail -1`
 			DEPENDS=""
 			SUGGESTED=""
diff -r d2c123d1284a -r 03544b89ac81 tazpanel/pkgs.cgi
--- a/tazpanel/pkgs.cgi	Thu Sep 24 07:50:22 2020 +0100
+++ b/tazpanel/pkgs.cgi	Tue Nov 09 12:03:43 2021 +0000
@@ -1392,7 +1392,7 @@
 				case $pkg in
 					*.htm*) cat $pkg ;;
 					*)	echo "<pre style=\"white-space: pre-wrap\">"
-						cat $pkg | htmlize | sed 's|\([hf]t*t*ps*://[a-zA-Z0-9./_-]*[a-zA-Z0-9/_-]\)|<a href="\1">\1</a>|'
+						htmlize < $pkg | sed 's|\([hf]t*t*ps*://[a-zA-Z0-9./_-]*[a-zA-Z0-9/_-]\)|<a href="\1">\1</a>|'
 						echo "</pre>"
 						;;
 				esac
@@ -1755,21 +1755,21 @@
 		<tr>
 			<td>$(_ 'Installed packages:')</td>
 			<td><a href="?list&amp;my=my&amp;cat=all&amp;repo=Any">
-				<b>$(cat $PKGS_DB/installed.info | wc -l)</b>
+				<b>$(wc -l < $PKGS_DB/installed.info)</b>
 				</a></td></tr>
 		<tr>
 			<td>$(_ 'Mirrored packages:')</td>
 			<td><a href="?list&amp;my=no&amp;cat=all&amp;repo=Any">
-				<b>$(cat $PKGS_DB/packages.list | wc -l)</b>
+				<b>$(wc -l < $PKGS_DB/packages.list)</b>
 				</a></td></tr>
 		<tr>
 			<td>$(_ 'Upgradeable packages:')</td>
 			<td><a href="?up">
-				<b>$(cat $PKGS_DB/packages.up | wc -l)</b>
+				<b>$(wc -l < $PKGS_DB/packages.up)</b>
 				</a></td></tr>
 		<tr>
 			<td>$(_ 'Installed files:')</td>
-			<td><b>$(cat $INSTALLED/*/files.list | wc -l)</b></td></tr>
+			<td><b>$(wc -l $INSTALLED/*/files.list)</b></td></tr>
 		<tr>
 			<td>$(_ 'Blocked packages:')</td>
 			<td><a href="?blocked">