From 5e905ce678d219f8c78a35b35e1d52fa7d841ae8 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Sun, 30 May 2021 01:53:31 +0200 Subject: [PATCH] Small script improvements --- Docs/Tools/fetchStats.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Docs/Tools/fetchStats.sh b/Docs/Tools/fetchStats.sh index 274032e9a5..0ec4df6c26 100755 --- a/Docs/Tools/fetchStats.sh +++ b/Docs/Tools/fetchStats.sh @@ -11,8 +11,16 @@ rm stats.*.json while [[ "$NEXT_URL" != "null" ]] do echo "$COUNTER '$NEXT_URL'" - curl "$NEXT_URL" -H 'User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:86.0) Gecko/20100101 Firefox/86.0' -H 'Accept: */*' -H 'Accept-Language: en-US,en;q=0.5' --compressed -H 'Referer: https://osmcha.org/?filters=%7B%22date__gte%22%3A%5B%7B%22label%22%3A%222020-07-05%22%2C%22value%22%3A%222020-07-05%22%7D%5D%2C%22editor%22%3A%5B%7B%22label%22%3A%22mapcomplete%22%2C%22value%22%3A%22mapcomplete%22%7D%5D%7D' -H 'Content-Type: application/json' -H 'Authorization: Token 6e422e2afedb79ef66573982012000281f03dc91' -H 'DNT: 1' -H 'Connection: keep-alive' -H 'TE: Trailers' -H 'Pragma: no-cache' -H 'Cache-Control: no-cache' -o stats.$COUNTER.json + $(curl "$NEXT_URL" --silent -H 'User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:86.0) Gecko/20100101 Firefox/86.0' -H 'Accept: */*' -H 'Accept-Language: en-US,en;q=0.5' --compressed -H 'Referer: https://osmcha.org/?filters=%7B%22date__gte%22%3A%5B%7B%22label%22%3A%222020-07-05%22%2C%22value%22%3A%222020-07-05%22%7D%5D%2C%22editor%22%3A%5B%7B%22label%22%3A%22mapcomplete%22%2C%22value%22%3A%22mapcomplete%22%7D%5D%7D' -H 'Content-Type: application/json' -H 'Authorization: Token 6e422e2afedb79ef66573982012000281f03dc91' -H 'DNT: 1' -H 'Connection: keep-alive' -H 'TE: Trailers' -H 'Pragma: no-cache' -H 'Cache-Control: no-cache' -o stats.$COUNTER.json) + if [ "$?" -eq 0 ]; + then + NEXT_URL=$(jq ".next" stats.$COUNTER.json | sed "s/\"//g") + let COUNTER++ + else + echo "Something failed - exiting now" + exit + fi - NEXT_URL=$(jq ".next" stats.$COUNTER.json | sed "s/\"//g") - let COUNTER++ + + done;