m/shell-scripting-templates
1
0
Fork 0
mirror of https://github.com/natelandau/shell-scripting-templates.git synced 2025-11-09 13:43:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

minor formatting changes

Browse Source
This commit is contained in:
Nathaniel Landau
2015-09-25 09:29:35 -04:00
parent b0a7a3ab27
commit ff765c9d14
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/sharedFunctions.sh
View File

@@ -475,10 +475,10 @@ progressBar() {
bar_char="#" bar_char="#"
# Don't run this function when scripts are running in verbose mode # Don't run this function when scripts are running in verbose mode
if $verbose; then return; fi if ${verbose}; then return; fi
# Reset the count # Reset the count
if [ -z $progressBarProgress ]; then if [ -z ${progressBarProgress} ]; then
progressBarProgress=0 progressBarProgress=0
fi fi
@@ -491,20 +491,20 @@ progressBar() {
tput civis tput civis
trap 'tput cnorm; exit 1' SIGINT trap 'tput cnorm; exit 1' SIGINT
if [ ! $progressBarProgress -eq $(( $1 - 1 )) ]; then if [ ! ${progressBarProgress} -eq $(( $1 - 1 )) ]; then
# Compute the percentage. # Compute the percentage.
perc=$(( $progressBarProgress * 100 / $1 )) perc=$(( ${progressBarProgress} * 100 / $1 ))
# Compute the number of blocks to represent the percentage. # Compute the number of blocks to represent the percentage.
num=$(( $progressBarProgress * $width / $1 )) num=$(( ${progressBarProgress} * $width / $1 ))
# Create the progress bar string. # Create the progress bar string.
bar= bar=
if [ $num -gt 0 ]; then if [ ${num} -gt 0 ]; then
bar=$(printf "%0.s${bar_char}" $(seq 1 $num)) bar=$(printf "%0.s${bar_char}" $(seq 1 ${num}))
fi fi
# Print the progress bar. # Print the progress bar.
line=$(printf "%s [%-${width}s] (%d%%)" "Running Process" "$bar" "${perc}") line=$(printf "%s [%-${width}s] (%d%%)" "Running Process" "${bar}" "${perc}")
echo -en "${line}\r" echo -en "${line}\r"
progressBarProgress=$[$progressBarProgress+1] progressBarProgress=$[${progressBarProgress}+1]
else else
# Clear the progress bar when complete # Clear the progress bar when complete
echo -ne "${width}%\033[0K\r" echo -ne "${width}%\033[0K\r"