zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve common/progress_bar.sh based on shellcheck:

Browse source 
- remove useless array declarations
  - remove unused variables
  - remove $ prefix for variable names in arithmetic expressions
  - normalize indentation (2 spaces)
This commit is contained in:
Pierre Labastie 2019-04-13 16:33:38 +00:00
parent 0e4ddfa0c1
commit bc2f5913e6
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
common/progress_bar.sh
View file

@ -1,4 +1,4 @@
# shellcheck shell=bash
# $Id$ # $Id$
set -e set -e
@ -15,11 +15,9 @@ declare -r ERASE_LINE=${CSI}$'2K'
declare -r FRAME_OPEN=${CSI}$'2G[' declare -r FRAME_OPEN=${CSI}$'2G['
declare -r FRAME_CLOSE=${CSI}$'63G]' declare -r FRAME_CLOSE=${CSI}$'63G]'
declare -r TS_POSITION=${CSI}$'65G' declare -r TS_POSITION=${CSI}$'65G'
declare -r LINE_WRAP_OFF=${CSI}$'?7l' declare -r RESET_LINE=${CURSOR_OFF}${ERASE_LINE}${FRAME_OPEN}${FRAME_CLOSE}
declare -r LINE_WRAP_ON=${CSI}$'?7h'
declare -a RESET_LINE=${CURSOR_OFF}${ERASE_LINE}${FRAME_OPEN}${FRAME_CLOSE}
declare -a GRAPHIC_STR="| / - \\ + " declare -r GRAPHIC_STR="| / - \\ + "
declare -i SEC=0 # Seconds accumulator declare -i SEC=0 # Seconds accumulator
declare -i PREV_SEC=0 declare -i PREV_SEC=0
@ -49,22 +47,22 @@ write_or_exit "${RESET_LINE}${TS_POSITION}0 min. 0 sec"
# loop forever.. # loop forever..
while true ; do while true ; do
# Loop through the animation string # Loop through the animation string
for GRAPHIC_CHAR in ${GRAPHIC_STR} ; do for GRAPHIC_CHAR in ${GRAPHIC_STR} ; do
write_or_exit "${CSI}$((SEC + 3))G${GRAPHIC_CHAR}" write_or_exit "${CSI}$((SEC + 3))G${GRAPHIC_CHAR}"
$SLEEP .12 # This value MUST be less than .2 seconds. $SLEEP .12 # This value MUST be less than .2 seconds.
done done
# A BASH internal variable, the number of seconds the script # A BASH internal variable, the number of seconds the script
# has been running. modulo convert to 0-59 # has been running. modulo convert to 0-59
SEC=$(($SECONDS % 60)) SEC=$((SECONDS % 60))
# Detect rollover of the seconds. # Detect rollover of the seconds.
(( PREV_SEC > SEC )) && write_or_exit "${RESET_LINE}" (( PREV_SEC > SEC )) && write_or_exit "${RESET_LINE}"
PREV_SEC=$SEC PREV_SEC=$SEC
# Display the accumulated time. div minutes.. modulo seconds. # Display the accumulated time. div minutes.. modulo seconds.
write_or_exit "${TS_POSITION}$(($SECONDS / 60)) min. $SEC sec" write_or_exit "${TS_POSITION}$((SECONDS / 60)) min. $SEC sec"
done done
exit exit