SliTaz Repositories

     1.1 --- a/cook	Fri May 08 14:57:12 2015 +0300
     1.2 +++ b/cook	Fri May 08 15:52:28 2015 +0300
     1.3 @@ -1109,6 +1109,13 @@
     1.4  }
     1.5  
     1.6  
     1.7 +# Return size of file in human readible format
     1.8 +# Note, "du" in opposite returns size occupied by file on disk (4KB multiple in most cases)
     1.9 +filesize() {
    1.10 +	busybox ls -lh "$1" | awk '{print $5 "B"}'
    1.11 +}
    1.12 +
    1.13 +
    1.14  #
    1.15  # Receipt functions to ease packaging
    1.16  #
    1.17 @@ -1452,11 +1459,13 @@
    1.18  		ln -s ../get.list extra.list
    1.19  		touch packages.equiv
    1.20  
    1.21 -		_ 'Creating file "%s"' 'packages.list'
    1.22 +		_n 'Creating file "%s"' 'packages.list'
    1.23  		ls -1 *.tazpkg | sed s'/.tazpkg//' > $PKGS/packages.list
    1.24 +		echo " ($(filesize $PKGS/packages.list))"
    1.25  
    1.26 -		_ 'Creating file "%s"' 'packages.md5'
    1.27 +		_n 'Creating file "%s"' 'packages.md5'
    1.28  		md5sum *.tazpkg > $PKGS/packages.md5
    1.29 +		echo " ($(filesize $PKGS/packages.md5))"
    1.30  
    1.31  		md5sum packages.md5 | cut -d' ' -f1 > ID
    1.32  		( cat ./ID | tr $'\n' ' '; date -ur ./ID +%s ) > IDs	# md5 and timestamp
    1.33 @@ -1514,44 +1523,46 @@
    1.34  		done
    1.35  
    1.36  		# Display list size.
    1.37 -		_ 'Done: %s (%s)' 'packages.desc'  "$(du -h $PKGS/packages.desc  | awk '{print $1}')"
    1.38 -		_ 'Done: %s (%s)' 'packages.txt'   "$(du -h $PKGS/packages.txt   | awk '{print $1}')"
    1.39 -		_ 'Done: %s (%s)' 'packages.equiv' "$(du -h $PKGS/packages.equiv | awk '{print $1}')"
    1.40 +		_ 'Done: %s (%s)' 'packages.desc'  "$(filesize $PKGS/packages.desc)"
    1.41 +		_ 'Done: %s (%s)' 'packages.txt'   "$(filesize $PKGS/packages.txt)"
    1.42 +		_ 'Done: %s (%s)' 'packages.info'  "$(filesize $PKGS/packages.info)"
    1.43 +		_ 'Done: %s (%s)' 'packages.equiv' "$(filesize $PKGS/packages.equiv)"
    1.44  
    1.45  		cd $PKGS
    1.46  
    1.47  		# files.list.lzma
    1.48 -		_ 'Creating file "%s"' 'files.list.lzma'
    1.49 +		_n 'Creating file "%s"' 'files.list.lzma'
    1.50  		touch files.list
    1.51  		# pkgs.slitaz.org strongly depends on list sorted by packages names
    1.52  		lzma e files.list files.list.lzma
    1.53 -		_ 'Done: %s (%s)' 'files.list.lzma' "$(du -h files.list.lzma | awk '{print $1}')"
    1.54 +		echo " ($(filesize $PKGS/files.list.lzma))"
    1.55  
    1.56  		# Pre-sorting filenames causes 10% smaller resulting lzma file
    1.57 -		_ 'Creating file "%s"' 'files-list.lzma'
    1.58 +		_n 'Creating file "%s"' 'files-list.lzma'
    1.59  		cat files.list | sort -k2 -o files.list.sorted
    1.60  		lzma e files.list.sorted files-list.lzma
    1.61  		rm -f files.list files.list.sorted
    1.62 -		_ 'Done: %s (%s)' 'files-list.lzma' "$(du -h files-list.lzma | awk '{print $1}')"
    1.63 +		echo " ($(filesize $PKGS/files-list.lzma))"
    1.64  
    1.65  		[ -e files.list.md5 ] && rm files.list.md5
    1.66  		md5sum files-list.lzma | cut -d' ' -f1 | tr -d $'\n' > files-list.md5
    1.67  
    1.68  		# packages.info.lzma
    1.69  		PI=packages.info
    1.70 -		_ 'Creating file "%s"' 'packages.info.lzma'
    1.71 +		_n 'Creating file "%s"' 'packages.info.lzma'
    1.72  		touch $PI
    1.73  		lzma e $PI $PI.lzma
    1.74 +		echo " ($(filesize $PKGS/packages.info.lzma))"
    1.75  
    1.76  		# Make bundle to fast recharge
    1.77 -		_ 'Creating file "%s"' 'bundle.tar.lzma'
    1.78 +		_n 'Creating file "%s"' 'bundle.tar.lzma'
    1.79  		[ -f bundle.tar.lzma ] && rm bundle.tar.lzma
    1.80 -		wget http://mirror1.slitaz.org/mirrors
    1.81 +		wget -q http://mirror1.slitaz.org/mirrors
    1.82  		busybox tar -chaf bundle.tar.lzma \
    1.83  			extra.list mirrors files-list.md5 packages.info \
    1.84  			packages.desc packages.md5 packages.txt packages.list packages.equiv
    1.85  		rm ./mirrors
    1.86 -		_ 'Done: %s (%s)' 'bundle.tar.lzma' "$(du -h bundle.tar.lzma | awk '{print $1}')"
    1.87 +		echo " ($(filesize $PKGS/bundle.tar.lzma))"
    1.88  
    1.89  		# Display some info.
    1.90  		separator