From d3eb1329a0749816cccbe76d551b54c1a68b1e62 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Thu, 14 Nov 2013 20:50:49 +0300 Subject: [PATCH 1/2] [android] Use default icons instead of failing --- builder/wikivoyage/makeapk.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/builder/wikivoyage/makeapk.sh b/builder/wikivoyage/makeapk.sh index 3e5607e..fa0729a 100644 --- a/builder/wikivoyage/makeapk.sh +++ b/builder/wikivoyage/makeapk.sh @@ -12,9 +12,14 @@ cat countries_to_generate.txt | while read country; do toCopy=(drawable-ldpi drawable-mdpi drawable-hdpi \ drawable-xhdpi drawable-xxhdpi) + COUNTRY_RES_DIR="../../android/icons/$country" + if [ ! -d "$COUNTRY_RES_DIR" ]; then + COUNTRY_RES_DIR="../../android/icons/default" + echo "ERROR: Icons are missing for $country - default icons are used" + fi for resDir in ${toCopy[*]} do - cp -f ../../android/icons/$country/$resDir/* ../../android/res/$resDir + cp -f $COUNTRY_RES_DIR/$resDir/* ../../android/res/$resDir echo "Copied $resDir for $country" done From 5dfd37d8cfff394a97354408ac11455d8fe05ba1 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Thu, 14 Nov 2013 20:51:27 +0300 Subject: [PATCH 2/2] Removed delay when downloading htmls, it was really slow in Minsk --- builder/wikivoyage/wikivoyage.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/wikivoyage/wikivoyage.mk b/builder/wikivoyage/wikivoyage.mk index 3903d7a..b698059 100644 --- a/builder/wikivoyage/wikivoyage.mk +++ b/builder/wikivoyage/wikivoyage.mk @@ -37,11 +37,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 --wait=0.2 --random-wait --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 --wait=0.2 --random-wait --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 +51,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 --wait=0.2 --random-wait --no-clobber --directory-prefix=images --input-file=image_url.txt || true - wget --wait=0.2 --random-wait --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: