cookutils rev 1061

Tiny edits
author Paul Issott <paul@slitaz.org>
date Wed May 30 07:07:40 2018 +0100 (2018-05-30)
parents 3911a2292888
children 45a7e146df74
files modules/pkgdb uname
line diff
     1.1 --- a/modules/pkgdb	Wed May 30 01:32:17 2018 +0300
     1.2 +++ b/modules/pkgdb	Wed May 30 07:07:40 2018 +0100
     1.3 @@ -14,7 +14,7 @@
     1.4  dblog() { tee -a $LOGS/pkgdb.log; }
     1.5  
     1.6  
     1.7 -# Return size of file in human readible format
     1.8 +# Return size of file in human readable format
     1.9  # Note, "du" in opposite returns size occupied by file on disk (4KB multiple in most cases)
    1.10  
    1.11  filesize() { busybox ls -lh "$1" | awk '{print $5 "B"}'; }
    1.12 @@ -68,11 +68,11 @@
    1.13  chmod 666 .folderlist .filelist
    1.14  
    1.15  # Command `cook pkgdb` may be executed by cron. Creating a packages database
    1.16 -# takes some time, during which previously pending packages may be continue to
    1.17 -# create. This will result in an error due to the lack of a database. This in
    1.18 +# takes some time, during which previously pending packages may continue to
    1.19 +# be created. This will result in an error due to the lack of a database. This in
    1.20  # turn can lead to errors in the creating of many subsequent packages and will
    1.21  # require manual intervention.
    1.22 -# Solution is an atomic update of packages database: first we create new files
    1.23 +# Solution is an atomic update of the packages database: first we create new files
    1.24  # (in the separate temp dir), and then instantly (well, almost) replace the old
    1.25  # files by new ones.
    1.26  
    1.27 @@ -100,7 +100,7 @@
    1.28  		pkgname=$(. $WOK/$i/taz/$j/receipt; echo $PACKAGE)
    1.29  		echo "$pkgname"
    1.30  		sed 's|^$| |' "$WOK/$i/taz/$j/description.txt"
    1.31 -		# if description.txt don't ends with \n then add one
    1.32 +		# if description.txt doesn't end with \n then add one
    1.33  		[ -z "$(tail -c1 $WOK/$i/taz/$j/description.txt)" ] || echo
    1.34  		echo
    1.35  	done >> $dbs/descriptions.txt
     2.1 --- a/uname	Wed May 30 01:32:17 2018 +0300
     2.2 +++ b/uname	Wed May 30 07:07:40 2018 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  #!/bin/sh
     2.5  # uname - special "fake" wrapper for using inside SliTaz cooker chroot.
     2.6  # Although SliTaz cooker *host arch* is 64-bit, SliTaz *target arch* may be
     2.7 -# 32-bit, and some configuration tools use uname could be improperly configured.
     2.8 +# 32-bit and some configuration tools using uname could be improperly configured.
     2.9  # This also applies to the kernel versions of the host and the target systems.
    2.10  
    2.11  . /etc/slitaz/cook.conf