From 909239b986c998dbadc9808ad93a714a311e8b46 Mon Sep 17 00:00:00 2001 From: Gautier Hattenberger Date: Mon, 11 May 2015 01:27:01 +0200 Subject: [PATCH] [conf] update google map version extraction script --- data/maps/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/maps/Makefile b/data/maps/Makefile index 33c0de785c..dd21fe146b 100644 --- a/data/maps/Makefile +++ b/data/maps/Makefile @@ -24,14 +24,14 @@ $(DATADIR): $(DATADIR)/maps.google.com: $(DATADIR) FORCE @echo "-----------------------------------------------" @echo "DOWNLOAD: google maps version code"; - $(Q)wget -q -t 1 -T 10 --no-check-certificate -O $(@) http://maps.google.com/ || \ + $(Q)wget -q -t 1 -T 10 --no-check-certificate -O $(@) http://maps.googleapis.com/maps/api/js || \ (rm -f $(@) && \ echo "Could not download google maps version code" && \ echo "-----------------------------------------------" && \ exit 1) $(PAPARAZZI_HOME)/conf/maps.xml: $(DATADIR)/maps.google.com - $(eval GOOGLE_VERSION := $(shell tr -s '[[:space:]]' '\n' < $(DATADIR)/maps.google.com | grep -E "http[s]?://khm[s]?[0-9]+.google.com/kh/v=[0-9]+.x26" | $(SED) -r 's#.*http[s]?://khm[s]?[0-9]+.google.com/kh/v=##;s#.x26.*##')) + $(eval GOOGLE_VERSION := $(shell tr -s '[[:space:]]' '\n' < $(DATADIR)/maps.google.com | grep -E "http[s]?://khm[s]?[0-9]+.google.com/kh\?v=[0-9]+\\\u" -m 1 | $(SED) -r 's#.*http[s]?://khm[s]?[0-9]+.google.com/kh\?v=##;s#.u0026.*##')) $(eval $@_TMP := $(shell $(MKTEMP))) $(Q)if [ "$(GOOGLE_VERSION)" -eq "$(GOOGLE_VERSION)" ] 2>/dev/null ; then \ echo "Updated google maps version to $(GOOGLE_VERSION)" ; \