From 73f2cee44c57049c4e6ef837339b05d7ba671edd Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Fri, 9 Oct 2015 13:50:54 +0300 Subject: [PATCH] [generator] Update osmctools and kothic; fix a bug in generate_planet --- tools/kothic | 2 +- tools/osmctools | 2 +- tools/unix/generate_planet.sh | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/kothic b/tools/kothic index 60c342cea1..b8d935731e 160000 --- a/tools/kothic +++ b/tools/kothic @@ -1 +1 @@ -Subproject commit 60c342cea1da0e934b549df0d380b070f5d9a34b +Subproject commit b8d935731e502c5390ba6764f32ba60be2fca884 diff --git a/tools/osmctools b/tools/osmctools index 6da67ed2e1..96953b50c9 160000 --- a/tools/osmctools +++ b/tools/osmctools @@ -1 +1 @@ -Subproject commit 6da67ed2e19bd1eb817ba5d16d1d52c193d61fd4 +Subproject commit 96953b50c96cee15f2742432cf7dea587be7c406 diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh index 404163b330..4c08193ae8 100755 --- a/tools/unix/generate_planet.sh +++ b/tools/unix/generate_planet.sh @@ -165,7 +165,9 @@ if [ -n "${REGIONS:-}" ]; then log "BORDERS" "Note: old borders from $TARGET/borders were moved to $BORDERS_BACKUP_PATH" mv "$TARGET/borders"/*.poly "$BORDERS_BACKUP_PATH" fi - echo "$REGIONS" | xargs -I % cp "%" "$TARGET/borders/" + for i in $REGIONS; do + cp "$i" "$TARGET/borders/" + done elif [ -z "${REGIONS-1}" ]; then # A user asked specifically for no regions NO_REGIONS=1