ChCh
/
departure
10
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

make output formating more obvious

This commit is contained in:
Florian Schlegel 2020-08-29 00:46:32 +02:00
parent 8226c29864
commit 7416b1c92b
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
departure.sh
View File

@ -201,18 +201,12 @@ while true; do
# Wenn Logo gezeichnet werden soll, baue Urzeit ran und zeichne
[ "$j" -eq "$LOGO_LINES_POSITION" ] && draw_logo_time MYOUTPUT $REALSTATION_NOW
for((i=${#STATION_NAME[$j]}; i<31; i++)); do
STATION_NAME[$j]="${STATION_NAME[$j]} "
done
MYOUTPUT="$MYOUTPUT\n\n\t\t┌────────────────────────────────┬─────────────────────────┐ \n\t\t│ ${STATION_NAME[$j]}│ $THISDATE │\n\t\t├────────────────────┬─────┬─────┴─────────────────────────┤\n"
MYOUTPUT="$MYOUTPUT\n\n\
\t\t┌────────────────────────────────┬─────────────────────────┐ \n\
\t\t│ ${STATION_NAME[$j]}$(printf "%-$((31-${#STATION_NAME[$j]}))s" "")│ $THISDATE │\n\
\t\t├────────────────────┬─────┬─────┴─────────────────────────┤\n"
LINECOUNT=${#STATION_LINES[*]}
for ((i=0; i<"$LINECOUNT"; i++)); do
for((k=${#STATION_LINES[$i]}; k<3 ; k++)); do
STATION_LINES[$i]=" ${STATION_LINES[$i]}"
done
for((k=${#STATION_DESTINATIONS[$i]}; k<29 ; k++)); do
STATION_DESTINATIONS[$i]="${STATION_DESTINATIONS[$i]} "
done
MILLIS=$((${STATION_ACTUAL_DEPARTURE[$i]} - STATION_NOW))
[ "$MILLIS" -lt 0 ] && MILLIS=0
SEKS=$((MILLIS / 1000)); MILLIS=$((MILLIS % 1000)); MINS=$((SEKS / 60)); SEKS=$((SEKS % 60))
@ -222,9 +216,11 @@ while true; do
[ "$SEKS" -lt 10 ] && SEKSSPACE=" "
[ "$MILLIS" -lt 100 ] && MILLISSPACE="0"
[ "$MILLIS" -lt 10 ] && MILLISSPACE="00"
MYOUTPUT="$MYOUTPUT\\t\\t│${MINSSPACE}${MINS} min ${SEKSSPACE}${SEKS},${MILLISSPACE}${MILLIS} s │ ${STATION_LINES[$i]} │ ${STATION_DESTINATIONS[$i]} │\\n"
MYOUTPUT="$MYOUTPUT\
\t\t│${MINSSPACE}${MINS} min ${SEKSSPACE}${SEKS},${MILLISSPACE}${MILLIS} s │ $(printf "%-$((3-${#STATION_LINES[$i]}))s" "")${STATION_LINES[$i]} │ ${STATION_DESTINATIONS[$i]}$(printf "%-$((29-${#STATION_DESTINATIONS[$i]}))s" "") │\\n"
done
MYOUTPUT="$MYOUTPUT\t\t└────────────────────┴─────┴───────────────────────────────┘"
MYOUTPUT="$MYOUTPUT\
\t\t└────────────────────┴─────┴───────────────────────────────┘"
done
[ "$LOGO_LINES_POSITION" -eq "${#STATION_ID[*]}" ] && draw_logo_time MYOUTPUT $REALSTATION_NOW
LOGO_LINES_POSITION=$(((LOGO_LINES_POSITION + 1) % (${#STATION_ID[*]} + 1)))