# HG changeset patch # User Aleksej Bobylev # Date 1431089548 -10800 # Node ID eb28efa6baf8ded8f22ca160d0fc3bd1eb6faab8 # Parent d65504d0c256d355b337d9d20ffa295a2f57079f cook pkgdb: display files sizes in the less chatty way. diff -r d65504d0c256 -r eb28efa6baf8 cook --- a/cook Fri May 08 14:57:12 2015 +0300 +++ b/cook Fri May 08 15:52:28 2015 +0300 @@ -1109,6 +1109,13 @@ } +# Return size of file in human readible format +# Note, "du" in opposite returns size occupied by file on disk (4KB multiple in most cases) +filesize() { + busybox ls -lh "$1" | awk '{print $5 "B"}' +} + + # # Receipt functions to ease packaging # @@ -1452,11 +1459,13 @@ ln -s ../get.list extra.list touch packages.equiv - _ 'Creating file "%s"' 'packages.list' + _n 'Creating file "%s"' 'packages.list' ls -1 *.tazpkg | sed s'/.tazpkg//' > $PKGS/packages.list + echo " ($(filesize $PKGS/packages.list))" - _ 'Creating file "%s"' 'packages.md5' + _n 'Creating file "%s"' 'packages.md5' md5sum *.tazpkg > $PKGS/packages.md5 + echo " ($(filesize $PKGS/packages.md5))" md5sum packages.md5 | cut -d' ' -f1 > ID ( cat ./ID | tr $'\n' ' '; date -ur ./ID +%s ) > IDs # md5 and timestamp @@ -1514,44 +1523,46 @@ done # Display list size. - _ 'Done: %s (%s)' 'packages.desc' "$(du -h $PKGS/packages.desc | awk '{print $1}')" - _ 'Done: %s (%s)' 'packages.txt' "$(du -h $PKGS/packages.txt | awk '{print $1}')" - _ 'Done: %s (%s)' 'packages.equiv' "$(du -h $PKGS/packages.equiv | awk '{print $1}')" + _ 'Done: %s (%s)' 'packages.desc' "$(filesize $PKGS/packages.desc)" + _ 'Done: %s (%s)' 'packages.txt' "$(filesize $PKGS/packages.txt)" + _ 'Done: %s (%s)' 'packages.info' "$(filesize $PKGS/packages.info)" + _ 'Done: %s (%s)' 'packages.equiv' "$(filesize $PKGS/packages.equiv)" cd $PKGS # files.list.lzma - _ 'Creating file "%s"' 'files.list.lzma' + _n 'Creating file "%s"' 'files.list.lzma' touch files.list # pkgs.slitaz.org strongly depends on list sorted by packages names lzma e files.list files.list.lzma - _ 'Done: %s (%s)' 'files.list.lzma' "$(du -h files.list.lzma | awk '{print $1}')" + echo " ($(filesize $PKGS/files.list.lzma))" # Pre-sorting filenames causes 10% smaller resulting lzma file - _ 'Creating file "%s"' 'files-list.lzma' + _n 'Creating file "%s"' 'files-list.lzma' cat files.list | sort -k2 -o files.list.sorted lzma e files.list.sorted files-list.lzma rm -f files.list files.list.sorted - _ 'Done: %s (%s)' 'files-list.lzma' "$(du -h files-list.lzma | awk '{print $1}')" + echo " ($(filesize $PKGS/files-list.lzma))" [ -e files.list.md5 ] && rm files.list.md5 md5sum files-list.lzma | cut -d' ' -f1 | tr -d $'\n' > files-list.md5 # packages.info.lzma PI=packages.info - _ 'Creating file "%s"' 'packages.info.lzma' + _n 'Creating file "%s"' 'packages.info.lzma' touch $PI lzma e $PI $PI.lzma + echo " ($(filesize $PKGS/packages.info.lzma))" # Make bundle to fast recharge - _ 'Creating file "%s"' 'bundle.tar.lzma' + _n 'Creating file "%s"' 'bundle.tar.lzma' [ -f bundle.tar.lzma ] && rm bundle.tar.lzma - wget http://mirror1.slitaz.org/mirrors + wget -q http://mirror1.slitaz.org/mirrors busybox tar -chaf bundle.tar.lzma \ extra.list mirrors files-list.md5 packages.info \ packages.desc packages.md5 packages.txt packages.list packages.equiv rm ./mirrors - _ 'Done: %s (%s)' 'bundle.tar.lzma' "$(du -h bundle.tar.lzma | awk '{print $1}')" + echo " ($(filesize $PKGS/bundle.tar.lzma))" # Display some info. separator