From babb593ce4ad27cac9fbb0b0cda1dfa323af5a53 Mon Sep 17 00:00:00 2001 From: Ville Rantanen Date: Tue, 25 Aug 2020 08:35:26 +0300 Subject: [PATCH] timing only if files counted --- files/rm-progress | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/files/rm-progress b/files/rm-progress index f08c2c2..bf37a81 100755 --- a/files/rm-progress +++ b/files/rm-progress @@ -49,15 +49,17 @@ function deletefiles() { printf -v timedone "%02d:%02d:%02d" \ $(($done/3600)) $(($done%3600/60)) $(($done%60)) fi - if [[ $(( $SECONDS - $left_update )) -ge 10 ]]; then - left_update=$SECONDS - left=$(( ($files - $i) * $SECONDS / $i )) - left_live=$left - else - left_live=$(( $left - $SECONDS + $left_update )) - fi - if [[ -n "$left" ]]; then - printf -v timeleft "%02d:%02d:%02d" $(($left_live/3600)) $(($left_live%3600/60)) $(($left_live%60)) + if [[ $files -ne 0 ]]; then + if [[ $(( $SECONDS - $left_update )) -ge 10 ]]; then + left_update=$SECONDS + left=$(( ($files - $i) * $SECONDS / $i )) + left_live=$left + else + left_live=$(( $left - $SECONDS + $left_update )) + fi + if [[ -n "$left" ]]; then + printf -v timeleft "%02d:%02d:%02d" $(($left_live/3600)) $(($left_live%3600/60)) $(($left_live%60)) + fi fi printf "\r%s %s %${filespad}d/%${filespad}d %2d%% %s\033[0K" \ "$timedone" "$timeleft" "$i" "$files" "$percent" "$line" @@ -69,6 +71,8 @@ function deletefiles() { $RMCOMMAND $RMFORCE "$line" fi done < <(find "$@" \( -type f -or -type l \) -print0) + printf "\r%s %s %${filespad}d/%${filespad}d %2d%%" \ + "$timedone" "$timeleft" "$i" "$files" "100" printf "\n" } function listfolders() {