# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1636474021 0
# Node ID b03531b3e96b0a35a42ca668af1890ccdf3703e1
# Parent  a74d76bc69520a4e03e37c590d5fc84b48937556
public/index.cgi: typo

diff -r a74d76bc6952 -r b03531b3e96b public/index.cgi
--- a/public/index.cgi	Sat Dec 14 17:15:41 2019 +0100
+++ b/public/index.cgi	Tue Nov 09 16:07:01 2021 +0000
@@ -56,7 +56,7 @@
 
 for dir in $(ls -td $public/slitaz-*)
 do
-	if [ -f $dir/receipt ] && (grep -q '^FLAVOR' $dir/receipt ]); then
+	if [ -f $dir/receipt ] && grep -q '^FLAVOR' $dir/receipt ; then
 		flavor=$(grep '^FLAVOR' $dir/receipt | cut -d '=' -f 2 | sed 's/\"//g' )
 		uri="$(basename $dir)"
 		desc=$(grep '^SHORT_DESC'  $dir/receipt| cut -d '=' -f 2 | sed 's/\"//g')
diff -r a74d76bc6952 -r b03531b3e96b web/lib/libpizza
--- a/web/lib/libpizza	Sat Dec 14 17:15:41 2019 +0100
+++ b/web/lib/libpizza	Tue Nov 09 16:07:01 2021 +0000
@@ -39,7 +39,7 @@
 
 # Log activities, we want first letter capitalized.
 log() {
-	grep ^[A-Z] | \
+	grep '^[A-Z]' | \
 		sed s"#^[A-Z]\([^']*\)#$(date '+%Y-%m-%d %H:%M') : \0#" >> $activity
 }
 
diff -r a74d76bc6952 -r b03531b3e96b web/pizza.cgi
--- a/web/pizza.cgi	Sat Dec 14 17:15:41 2019 +0100
+++ b/web/pizza.cgi	Tue Nov 09 16:07:01 2021 +0000
@@ -125,7 +125,7 @@
 		. $tmpdir/slitaz-$id/receipt
 		addfiles=$(find $tmpdir/slitaz-$id/addfiles -type f | wc -l)
 		[ "$addfiles" ] || addfiles=0
-		packages=$(cat $tmpdir/slitaz-$id/packages.list | wc -l)
+		packages=$(wc -l < $tmpdir/slitaz-$id/packages.list)
 		cat << EOT
 <h2>$(gettext "Generate")</h2>
 <p>
@@ -259,8 +259,8 @@
 			list="$queue/slitaz-$id/packages.list"
 			msg="$(gettext 'Flavor is building or still in the build queue')"
 		fi
-		pkgslist=$(cat $list | wc -l)
-		pkgsinst=$(cat $installed | wc -l)
+		pkgslist=$(wc -l < $list)
+		pkgsinst=$(wc -l < $installed)
 		[ "$pkgsinst" ] || pkgsinst=0
 		[ "$ISO_SIZE" ] || ISO_SIZE="N/A"
 		[ "$ROOTFS_SIZE" ] || ROOTFS_SIZE="N/A"
@@ -278,7 +278,7 @@
 </pre>
 
 <div>
-	<img src="images/iso.png" alt="[ iso ]" /> $(echo $msg)
+	<img src="images/iso.png" alt="[ iso ]" /> $msg
 </div>
 <div>
 	<img src="images/archive.png" alt="[ tarball ]" />
@@ -301,7 +301,7 @@
 			echo '<h2>Distro log</h2>'
 			echo '<pre>'
 			fgrep 'Build time' $log
-			cat $log | highlighter log
+			highlighter log < $log
 			echo '</pre>'
 		fi ;;
 	*\ helper\ *)
diff -r a74d76bc6952 -r b03531b3e96b web/pkgs.cgi
--- a/web/pkgs.cgi	Sat Dec 14 17:15:41 2019 +0100
+++ b/web/pkgs.cgi	Tue Nov 09 16:07:01 2021 +0000
@@ -24,7 +24,7 @@
 # Pizza uses local packages synced with mirror each night.
 list_pkgs() {
 	[ ! -f "$list" ] && echo "Missing: $pkgsdesc"
-	cat $pkgsdesc | while read PACKAGE VERSION SHORT_DESC
+	while read PACKAGE VERSION SHORT_DESC
 	do
 		cat << EOT
 
@@ -35,7 +35,7 @@
 			<td>$SHORT_DESC</td>
 		</tr>
 EOT
-	done
+	done < $pkgsdesc
 }
 
 # Gen a receipt for new flavor.
@@ -122,7 +122,7 @@
 #
 . $tmpdir/slitaz-$id/receipt
 
-nb=$(cat $list | wc -l)
+nb=$(wc -l < $list)
 cat << EOT
 <h2>Packages ($nb)</h2>