diff --git a/builder/wikivoyage/wikivoyage.mk b/builder/wikivoyage/wikivoyage.mk index cc36c07..c58fa6c 100644 --- a/builder/wikivoyage/wikivoyage.mk +++ b/builder/wikivoyage/wikivoyage.mk @@ -10,6 +10,8 @@ HTML_ARTICLE_PREFIX="http://en.m.wikivoyage.org/wiki?curid=" DUMP_FILES = page.sql.gz redirect.sql.gz category.sql.gz page_props.sql.gz image.sql.gz site_stats.sql.gz interwiki.sql.gz \ pagelinks.sql.gz imagelinks.sql.gz categorylinks.sql.gz langlinks.sql.gz externallinks.sql.gz templatelinks.sql.gz +WGET="wget --waitretry=10 --timeout=10" + .PHONY: all all: download_images rename_articles countries.txt geocodes.txt process_html make_data_zip make_apk @@ -20,7 +22,7 @@ clean: rm -r Countries $(DUMP_FILES): - wget $(DUMP_URL_PREFIX)"-"$@ -O $@ + $WGET $(DUMP_URL_PREFIX)"-"$@ -O $@ load_sql_dumps: $(DUMP_FILES) echo "CREATE DATABASE IF NOT EXISTS $(MYSQL_DATABASE)" | $(MYSQL_BINARY) --user=$(MYSQL_USER) @@ -37,11 +39,11 @@ article_page_url_desktop.txt: article_page_url.txt cat article_page_url.txt | sed 's/[.]m[.]/./' > article_page_url_desktop.txt download_articles: article_page_url.txt - wget --no-clobber --directory-prefix=articles --input-file=article_page_url.txt || true + $WGET --no-clobber --directory-prefix=articles --input-file=article_page_url.txt || true touch download_articles download_articles_desktop: article_page_url_desktop.txt - wget --no-clobber --directory-prefix=articles_desktop --input-file=article_page_url_desktop.txt || true + $WGET --no-clobber --directory-prefix=articles_desktop --input-file=article_page_url_desktop.txt || true touch download_articles_desktop image_url.txt: download_articles @@ -51,8 +53,8 @@ image_url_desktop.txt: download_articles_desktop grep --only-matching --no-filename --mmap ']*"' -r articles_desktop/ | sed 's/ image_url_desktop.txt download_images: image_url.txt image_url_desktop.txt - wget --no-clobber --directory-prefix=images --input-file=image_url.txt || true - wget --no-clobber --directory-prefix=images --input-file=image_url_desktop.txt || true + $WGET --no-clobber --directory-prefix=images --input-file=image_url.txt || true + $WGET --no-clobber --directory-prefix=images --input-file=image_url_desktop.txt || true touch download_images rename_articles: