From 91943253bc309b8b7e929140563c5eeec4c3a48f Mon Sep 17 00:00:00 2001 From: Florian Schlegel Date: Sat, 29 Aug 2020 16:09:06 +0200 Subject: [PATCH] check API instead of our own website --- departure.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/departure.sh b/departure.sh index e0eeca9..3b5bccc 100755 --- a/departure.sh +++ b/departure.sh @@ -171,7 +171,7 @@ get_cvag_station_info() local -n _REALSTATION_NOW=$7 local -n _THISDATE=$8 - STATION_SCHEDULE="$(curl --connect-timeout 5 -s http://cvag.de/eza/mis/stops/station/CAG-${STATION_ID[$1]})" + STATION_SCHEDULE="$(curl --connect-timeout 5 -s "http://www.cvag.de/eza/mis/stops/station/CAG-${STATION_ID[$1]}")" _STATION_STOPS=$(echo "$STATION_SCHEDULE" | jq -r ".stops | .[]") _STATION_NOW=$(echo "$STATION_SCHEDULE" | jq -r ".now") @@ -200,12 +200,13 @@ draw_logo_time() LOGO_LINES_POSITION=0 STATION_NAME=() while true; do - if ! ping -q -c1 chch.it>/dev/null; then - echo -e "\\n\\n\\n\\tNo internet connection!" + [ ${#STATION_NAME[@]} -eq 0 ] && get_cvag_station_name STATION_NAME STATION_ID + if [ ${#STATION_NAME[@]} -eq 0 -o -z "$(curl --connect-timeout 5 -s "http://www.cvag.de/eza/mis/stops/station/CAG-0" | grep -oe "^{.*}$")" ]; then + clear + echo -e "\\n\\n\\n\\tService unavailable!" sleep 10 clear else - [ ${#STATION_NAME[@]} -eq 0 ] && get_cvag_station_name STATION_NAME STATION_ID MYOUTPUT=() MYOUTPUT[0]="\\n "