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