AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[generator] Small fixes in generator scripts

Browse source
This commit is contained in:
Ilya Zverev 2015-10-19 21:02:14 +03:00
parent f274104956
commit bc18d672bc
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/unix/generate_planet.sh
View file

@ -257,7 +257,6 @@ if [ "$MODE" == "coast" ]; then
log "STATUS" "Coastline merge failed"
if [ -n "$OPT_UPDATE" ]; then
[ -n "${MAIL-}" ] && tail -n 50 "$LOG_PATH/WorldCoasts.log" | mailx -s "Generate_planet: coastline merge failed, next try in $MERGE_INTERVAL minutes" "$MAIL"
date -u
echo "Will try fresh coasts again in $MERGE_INTERVAL minutes, or press a key..."
read -rs -n 1 -t $(($MERGE_INTERVAL * 60)) || true
TRY_AGAIN=1

2
tools/unix/test_planet.sh
View file

@ -26,7 +26,7 @@ echo '### LOGS'
grep -i 'error\|warn\|critical\|fail\|abort\|останов\|fatal' "$PLANET_LOG" | grep -v 'settings\.ini'
for log in "$LOG_PATH"/*.log; do
if [ "$log" != "$PLANET_LOG" -a "$log" != "$LOG_PATH/test_planet.log" ]; then
CONTENT="$(grep -i 'error\|warn\|critical\|fail\|abort\|останов\|fatal' "$log" | grep -v 'settings\.ini\|language file for co\|Zero length lin\|too many tokens\|Equal choices for way\|No feature id for way\|number of threads is\|Invalid order of edges')"
CONTENT="$(grep -i 'error\|warn\|critical\|fail\|abort\|останов\|fatal\|fault' "$log" | grep -v 'settings\.ini\|language file for co\|Zero length lin\|too many tokens\|Equal choices for way\|No feature id for way\|number of threads is\|Invalid order of edges')"
if [ -n "$CONTENT" ]; then
echo
echo "$log"