From 4eb1456f1e848f11fed9eae0fe72eb8656b8976f Mon Sep 17 00:00:00 2001 From: Markus Koch Date: Sun, 23 Jul 2023 19:20:34 +0200 Subject: [PATCH] scripts: Update server URL --- scripts/geojson/maps/common.sh | 1 + scripts/geojson/maps/fetch_bodiesofwater.sh | 2 +- scripts/geojson/maps/fetch_city_outlines.sh | 2 +- scripts/geojson/maps/fetch_streets.sh | 2 +- scripts/geojson/maps/fetch_trainlines.sh | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/geojson/maps/common.sh b/scripts/geojson/maps/common.sh index c302bbf..c47aebd 100755 --- a/scripts/geojson/maps/common.sh +++ b/scripts/geojson/maps/common.sh @@ -1,3 +1,4 @@ #!/bin/bash +LIFO_SERVER="https://wiki.linux-forks.de" CURLOPTS=( '-b' "/etc/lifomapserver/cookies.txt" ) diff --git a/scripts/geojson/maps/fetch_bodiesofwater.sh b/scripts/geojson/maps/fetch_bodiesofwater.sh index 20ef6c2..ad2949b 100755 --- a/scripts/geojson/maps/fetch_bodiesofwater.sh +++ b/scripts/geojson/maps/fetch_bodiesofwater.sh @@ -2,7 +2,7 @@ source common.sh -json=`curl ${CURLOPTS[@]} 'https://wiki.linux-forks.de/mediawiki/api.php?action=query&prop=revisions&rvprop=content&format=json&titles=Maps:BodiesOfWater'` +json=`curl ${CURLOPTS[@]} $LIFO_SERVER'/api.php?action=query&prop=revisions&rvprop=content&format=json&titles=Maps:BodiesOfWater'` data=`echo "$json" | json_reformat | sed -e 's/\\\\n//g' -n -e 's/begin:mapdata\([^}]\+\)/\1/gp' | sed -e "s/|-|/}/g"` section="" diff --git a/scripts/geojson/maps/fetch_city_outlines.sh b/scripts/geojson/maps/fetch_city_outlines.sh index ad41d70..5a1f134 100755 --- a/scripts/geojson/maps/fetch_city_outlines.sh +++ b/scripts/geojson/maps/fetch_city_outlines.sh @@ -2,7 +2,7 @@ source common.sh -json=`curl ${CURLOPTS[@]} 'https://wiki.linux-forks.de/mediawiki/api.php?action=query&prop=revisions&rvprop=content&format=json&titles=Maps:Cities'` +json=`curl ${CURLOPTS[@]} $LIFO_SERVER'/api.php?action=query&prop=revisions&rvprop=content&format=json&titles=Maps:Cities'` data=`echo "$json" | json_reformat | sed -e 's/\\\\n//g' -n -e 's/begin:mapdata\([^}]\+\)/\1/gp' | sed -e "s/|-|/}/g"` echo "[" diff --git a/scripts/geojson/maps/fetch_streets.sh b/scripts/geojson/maps/fetch_streets.sh index e4491b5..48f773b 100755 --- a/scripts/geojson/maps/fetch_streets.sh +++ b/scripts/geojson/maps/fetch_streets.sh @@ -4,7 +4,7 @@ source common.sh -json=`curl ${CURLOPTS[@]} 'https://wiki.linux-forks.de/mediawiki/api.php?action=query&prop=revisions&rvprop=content&format=json&titles=Maps:Streets'` +json=`curl ${CURLOPTS[@]} $LIFO_SERVER'/api.php?action=query&prop=revisions&rvprop=content&format=json&titles=Maps:Streets'` data=`echo "$json" | json_reformat | sed -e 's/\\\\n//g' -n -e 's/begin:mapdata\([^}]\+\)/\1/gp' | sed -e "s/|-|/}/g"` echo "[" diff --git a/scripts/geojson/maps/fetch_trainlines.sh b/scripts/geojson/maps/fetch_trainlines.sh index da6f082..db7dce0 100755 --- a/scripts/geojson/maps/fetch_trainlines.sh +++ b/scripts/geojson/maps/fetch_trainlines.sh @@ -2,7 +2,7 @@ source common.sh -json=`curl ${CURLOPTS[@]} 'https://wiki.linux-forks.de/mediawiki/api.php?action=query&prop=revisions&rvprop=content&format=json&titles=Maps:Trainlines'` +json=`curl ${CURLOPTS[@]} $LIFO_SERVER'/api.php?action=query&prop=revisions&rvprop=content&format=json&titles=Maps:Trainlines'` data=`echo "$json" | json_reformat | sed -e 's/\\\\n//g' -n -e 's/begin:mapdata\([^}]\+\)/\1/gp' | sed -e "s/|-|/}/g"` section=""