diff --git a/atom b/atom index 6c62e17..22f6e4b 100755 --- a/atom +++ b/atom @@ -585,6 +585,15 @@ createDestinations() { done } +progressSpin() { + case $(( ++count % 40 )) in + 0) echo -ne '\b|' ;; + 10) echo -ne '\b/' ;; + 20) echo -en '\b-' ;; + 30) echo -ne '\b\\' ;; + *) ;; + esac +} getFiles() { scantime=$(date +%s) for prune_expression in "${skippeddirectories[@]}" @@ -629,18 +638,12 @@ getFiles() { filename = $filename EOWhere fi - case $(( ++count % 40 )) in - 0) echo -ne '\b|' ;; - 10) echo -ne '\b/' ;; - 20) echo -en '\b-' ;; - 30) echo -ne '\b\\' ;; - *) ;; - esac + progressSpin done < <( find "$sourcepath" $prunes -type f -printf "%T@ %s %P\n" ) echo 'COMMIT;' >&3 - echo -e "\r$count files found, ${new:=0} new or changed." + echo -e "\r${count:-0} files found, ${new:=0} new or changed." unset count } @@ -1166,7 +1169,7 @@ do fi done echo 'COMMIT;' >&3 -echo -e "\rRead tags from $count files." +echo -e "\rRead tags from ${count:-0} files." unset count tagfiles echo ' @@ -1292,13 +1295,7 @@ do status 0 EOInsert ) - case $(( ++count % 40 )) in - 0) echo -ne '\b|' ;; - 10) echo -ne '\b/' ;; - 20) echo -en '\b-' ;; - 30) echo -ne '\b\\' ;; - *) ;; - esac + progressSpin fi if (( sox_needed )) then @@ -1315,13 +1312,7 @@ do status 0 EOInsert ) - case $(( ++count % 40 )) in - 0) echo -ne '\b|' ;; - 10) echo -ne '\b/' ;; - 20) echo -en '\b-' ;; - 30) echo -ne '\b\\' ;; - *) ;; - esac + progressSpin fi fi unset \