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

reduce lines of code, improve overview

This commit is contained in:
Florian Schlegel 2020-08-23 16:56:18 +02:00
parent 489a238657
commit 3160b97b20
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
departure.sh
View File

@ -186,13 +186,9 @@ while true; do
STATION_STOPS=$(echo "$STATION_SCHEDULE" | jq -r ".stops | .[]") STATION_STOPS=$(echo "$STATION_SCHEDULE" | jq -r ".stops | .[]")
STATION_NOW=$(echo "$STATION_SCHEDULE" | jq -r ".now") STATION_NOW=$(echo "$STATION_SCHEDULE" | jq -r ".now")
if [ ${#STATION_NOW} -lt 1 ]; then [ ${#STATION_NOW} -lt 1 ] && STATION_NOW="0"
STATION_NOW="0"
fi
REALSTATION_NOWMS=$(( "$STATION_NOW" % 1000 )) REALSTATION_NOWMS=$(( "$STATION_NOW" % 1000 ))
if [ ${#REALSTATION_NOWMS} -lt 3 ]; then [ ${#REALSTATION_NOWMS} -lt 3 ] && REALSTATION_NOWMS="0""$REALSTATION_NOWMS"
REALSTATION_NOWMS="0""$REALSTATION_NOWMS"
fi
REALSTATION_NOW=$(( "$STATION_NOW" / 1000)) REALSTATION_NOW=$(( "$STATION_NOW" / 1000))
THISDATE=$(date --date="@$REALSTATION_NOW" +"%d.%m.%Y %T")",$REALSTATION_NOWMS" THISDATE=$(date --date="@$REALSTATION_NOW" +"%d.%m.%Y %T")",$REALSTATION_NOWMS"
@ -218,9 +214,7 @@ while true; do
DESTINATIONS[$i]="${DESTINATIONS[$i]}"" " DESTINATIONS[$i]="${DESTINATIONS[$i]}"" "
done done
MILLIS=$((${ACDEPS[$i]} - STATION_NOW)) MILLIS=$((${ACDEPS[$i]} - STATION_NOW))
if [ "$MILLIS" -lt 0 ]; then [ "$MILLIS" -lt 0 ] && MILLIS=0
MILLIS=0
fi
SEKS=$((MILLIS / 1000)) SEKS=$((MILLIS / 1000))
MILLIS=$((MILLIS % 1000)) MILLIS=$((MILLIS % 1000))
MINS=$((SEKS / 60)) MINS=$((SEKS / 60))
@ -228,21 +222,11 @@ while true; do
MINSSPACE="" MINSSPACE=""
SEKSSPACE="" SEKSSPACE=""
MILLISSPACE="" MILLISSPACE=""
if [ "$MINS" -lt 100 ]; then [ "$MINS" -lt 100 ] && MINSSPACE=" "
MINSSPACE=" " [ "$MINS" -lt 10 ] && MINSSPACE=" "
fi [ "$SEKS" -lt 10 ] && SEKSSPACE=" "
if [ "$MINS" -lt 10 ]; then [ "$MILLIS" -lt 100 ] && MILLISSPACE="0"
MINSSPACE=" " [ "$MILLIS" -lt 10 ] && MILLISSPACE="00"
fi
if [ "$SEKS" -lt 10 ]; then
SEKSSPACE=" "
fi
if [ "$MILLIS" -lt 100 ]; then
MILLISSPACE="0"
fi
if [ "$MILLIS" -lt 10 ]; then
MILLISSPACE="00"
fi
MYOUTPUT="$MYOUTPUT""\\t\\t│${MINSSPACE}${MINS} min ${SEKSSPACE}${SEKS},${MILLISSPACE}${MILLIS} s │ ${LINES[$i]} │ ${DESTINATIONS[$i]} │\\n" MYOUTPUT="$MYOUTPUT""\\t\\t│${MINSSPACE}${MINS} min ${SEKSSPACE}${SEKS},${MILLISSPACE}${MILLIS} s │ ${LINES[$i]} │ ${DESTINATIONS[$i]} │\\n"
done done
MYOUTPUT="$MYOUTPUT"'\t\t└────────────────────┴─────┴───────────────────────────────┘' MYOUTPUT="$MYOUTPUT"'\t\t└────────────────────┴─────┴───────────────────────────────┘'