X-Git-Url: https://plomlompom.com/repos/?p=berlin-corona-table;a=blobdiff_plain;f=update.sh;h=fee5ef593c4b4f2ea1e6fb6e77a8d7b41f917a53;hp=11bfb0f997b323ff876ea1d968e3fd04622eaa53;hb=HEAD;hpb=2843d6502fecf9164ae69bcc8000b70ac6376c8f

diff --git a/update.sh b/update.sh
index 11bfb0f..fee5ef5 100755
--- a/update.sh
+++ b/update.sh
@@ -1,22 +1,17 @@
 #!/bin/sh
 set -e
 
-CSV_URL=https://www.berlin.de/lageso/_assets/gesundheit/publikationen/corona/bezirkstabelle.csv
 table_path=daily_infections_table.txt
 
-# If we don't have a table file yet, we need to provide its header.
-header="            CW  FK  Li  MH  Mi  Ne  Pa  Re  Sp  SZ  TS  TK sum"
-if [ ! -f "${table_path}" ]; then
-    echo  "${header}" > "${table_path}"
-fi
-
-# Parse Lageso day table of new infections by district into new line for history table.
-today="$(date +%Y-%m-%d)"
-curl "${CSV_URL}" \
-| awk 'BEGIN { FS=";"; ORS=""; print "'${today}'" }; '\
-'!/^Bezirk/ { printf "%4d", $3 }; '\
-'END { printf "\n" }' "${filename}" >> "${table_path}" 
+# Re-build infections table.
+./scrape.py > "${table_path}"
 
 # Write enhanced table output to directory served by web server.
-./enhance_table.py "${table_path}" txt > /var/www/html/berlin_corona.txt
-./enhance_table.py "${table_path}" html > /var/www/html/berlin_corona.html
+#
+# Use intermediate /tmp/ step so we don't overwrite a valid previous output with
+# the emptiness delivered to stdout on any error, before such an error would
+# kill this script due to "set -e".
+./enhance_table.py "${table_path}" html > /tmp/berlin_corona.html
+./enhance_table.py "${table_path}" txt > /tmp/berlin_corona.txt
+mv /tmp/berlin_corona.html /var/www/html/
+mv /tmp/berlin_corona.txt /var/www/html/