From 6d295ce0c5d2117b14e93626aff0f7c9364d337d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 29 Jan 2014 22:03:41 +0100 Subject: sstate-cache-management.sh: Show total number of files when showing how many will be deleted * it's good to see some the ratio of delted files until now it was showing only when all or none files were to be removed (From OE-Core rev: 54e6e25f1a369fa6c21ce0f9db3479b1a481825f) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- scripts/sstate-cache-management.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'scripts/sstate-cache-management.sh') diff --git a/scripts/sstate-cache-management.sh b/scripts/sstate-cache-management.sh index 30ba8c6241..035bb25f89 100755 --- a/scripts/sstate-cache-management.sh +++ b/scripts/sstate-cache-management.sh @@ -95,7 +95,7 @@ do_nothing () { # Read the input "y" read_confirm () { - echo -n "$total_deleted files will be removed! " + echo -n "$total_deleted from $total_files files will be removed! " if [ "$confirm" != "y" ]; then echo -n "Do you want to continue (y/n)? " while read confirm; do @@ -186,6 +186,8 @@ remove_duplicated () { | sed -e 's/-/_/g' -e 's/ /\n/g' | sort -u) echo "Done" + # Total number of files including sstate-, sigdata and .done files + total_files=`find $cache_dir -name 'sstate*' | wc -l` # Save all the sstate files in a file sstate_list=`mktemp` || exit 1 find $cache_dir -name 'sstate:*:*:*:*:*:*:*.tgz' >$sstate_list @@ -212,6 +214,8 @@ remove_duplicated () { local remove_listdir=`mktemp -d` || exit 1 for suffix in $sstate_suffixes; do + # Total number of files including sigdata and .done files + total_files_suffix=`grep ".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix.*" $sstate_list | wc -l 2>/dev/null` # Save the file list to a file, some suffix's file may not exist grep ".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix.tgz" $sstate_list >$list_suffix 2>/dev/null local deleted=0 @@ -258,7 +262,7 @@ remove_duplicated () { done [ ! -s "$rm_list" ] || deleted=`cat $rm_list | wc -l` [ -s "$rm_list" -a $debug -gt 0 ] && cat $rm_list - echo "($deleted files will be removed)" + echo "($deleted from $total_files_suffix files for $suffix suffix will be removed)" let total_deleted=$total_deleted+$deleted done deleted=0 @@ -319,6 +323,8 @@ rm_by_stamps (){ done echo "Done" + # Total number of files including sstate-, sigdata and .done files + total_files=`find $cache_dir -name 'sstate*' | wc -l` # Save all the state file list to a file find $cache_dir -name 'sstate*.tgz' | sort -u -o $cache_list -- cgit v1.2.3-54-g00ecf