slitaz-pizza rev 131 tip

public/index.cgi: typo
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Nov 09 16:07:01 2021 +0000 (2021-11-09)
parents a74d76bc6952
children
files public/index.cgi web/lib/libpizza web/pizza.cgi web/pkgs.cgi
line diff
     1.1 --- a/public/index.cgi	Sat Dec 14 17:15:41 2019 +0100
     1.2 +++ b/public/index.cgi	Tue Nov 09 16:07:01 2021 +0000
     1.3 @@ -56,7 +56,7 @@
     1.4  
     1.5  for dir in $(ls -td $public/slitaz-*)
     1.6  do
     1.7 -	if [ -f $dir/receipt ] && (grep -q '^FLAVOR' $dir/receipt ]); then
     1.8 +	if [ -f $dir/receipt ] && grep -q '^FLAVOR' $dir/receipt ; then
     1.9  		flavor=$(grep '^FLAVOR' $dir/receipt | cut -d '=' -f 2 | sed 's/\"//g' )
    1.10  		uri="$(basename $dir)"
    1.11  		desc=$(grep '^SHORT_DESC'  $dir/receipt| cut -d '=' -f 2 | sed 's/\"//g')
     2.1 --- a/web/lib/libpizza	Sat Dec 14 17:15:41 2019 +0100
     2.2 +++ b/web/lib/libpizza	Tue Nov 09 16:07:01 2021 +0000
     2.3 @@ -39,7 +39,7 @@
     2.4  
     2.5  # Log activities, we want first letter capitalized.
     2.6  log() {
     2.7 -	grep ^[A-Z] | \
     2.8 +	grep '^[A-Z]' | \
     2.9  		sed s"#^[A-Z]\([^']*\)#$(date '+%Y-%m-%d %H:%M') : \0#" >> $activity
    2.10  }
    2.11  
     3.1 --- a/web/pizza.cgi	Sat Dec 14 17:15:41 2019 +0100
     3.2 +++ b/web/pizza.cgi	Tue Nov 09 16:07:01 2021 +0000
     3.3 @@ -125,7 +125,7 @@
     3.4  		. $tmpdir/slitaz-$id/receipt
     3.5  		addfiles=$(find $tmpdir/slitaz-$id/addfiles -type f | wc -l)
     3.6  		[ "$addfiles" ] || addfiles=0
     3.7 -		packages=$(cat $tmpdir/slitaz-$id/packages.list | wc -l)
     3.8 +		packages=$(wc -l < $tmpdir/slitaz-$id/packages.list)
     3.9  		cat << EOT
    3.10  <h2>$(gettext "Generate")</h2>
    3.11  <p>
    3.12 @@ -259,8 +259,8 @@
    3.13  			list="$queue/slitaz-$id/packages.list"
    3.14  			msg="$(gettext 'Flavor is building or still in the build queue')"
    3.15  		fi
    3.16 -		pkgslist=$(cat $list | wc -l)
    3.17 -		pkgsinst=$(cat $installed | wc -l)
    3.18 +		pkgslist=$(wc -l < $list)
    3.19 +		pkgsinst=$(wc -l < $installed)
    3.20  		[ "$pkgsinst" ] || pkgsinst=0
    3.21  		[ "$ISO_SIZE" ] || ISO_SIZE="N/A"
    3.22  		[ "$ROOTFS_SIZE" ] || ROOTFS_SIZE="N/A"
    3.23 @@ -278,7 +278,7 @@
    3.24  </pre>
    3.25  
    3.26  <div>
    3.27 -	<img src="images/iso.png" alt="[ iso ]" /> $(echo $msg)
    3.28 +	<img src="images/iso.png" alt="[ iso ]" /> $msg
    3.29  </div>
    3.30  <div>
    3.31  	<img src="images/archive.png" alt="[ tarball ]" />
    3.32 @@ -301,7 +301,7 @@
    3.33  			echo '<h2>Distro log</h2>'
    3.34  			echo '<pre>'
    3.35  			fgrep 'Build time' $log
    3.36 -			cat $log | highlighter log
    3.37 +			highlighter log < $log
    3.38  			echo '</pre>'
    3.39  		fi ;;
    3.40  	*\ helper\ *)
     4.1 --- a/web/pkgs.cgi	Sat Dec 14 17:15:41 2019 +0100
     4.2 +++ b/web/pkgs.cgi	Tue Nov 09 16:07:01 2021 +0000
     4.3 @@ -24,7 +24,7 @@
     4.4  # Pizza uses local packages synced with mirror each night.
     4.5  list_pkgs() {
     4.6  	[ ! -f "$list" ] && echo "Missing: $pkgsdesc"
     4.7 -	cat $pkgsdesc | while read PACKAGE VERSION SHORT_DESC
     4.8 +	while read PACKAGE VERSION SHORT_DESC
     4.9  	do
    4.10  		cat << EOT
    4.11  
    4.12 @@ -35,7 +35,7 @@
    4.13  			<td>$SHORT_DESC</td>
    4.14  		</tr>
    4.15  EOT
    4.16 -	done
    4.17 +	done < $pkgsdesc
    4.18  }
    4.19  
    4.20  # Gen a receipt for new flavor.
    4.21 @@ -122,7 +122,7 @@
    4.22  #
    4.23  . $tmpdir/slitaz-$id/receipt
    4.24  
    4.25 -nb=$(cat $list | wc -l)
    4.26 +nb=$(wc -l < $list)
    4.27  cat << EOT
    4.28  <h2>Packages ($nb)</h2>
    4.29