diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh index 86dca5de41..1c1d11d911 100755 --- a/tools/unix/generate_planet.sh +++ b/tools/unix/generate_planet.sh @@ -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 diff --git a/tools/unix/test_planet.sh b/tools/unix/test_planet.sh index fba844bfdb..adc95f747e 100755 --- a/tools/unix/test_planet.sh +++ b/tools/unix/test_planet.sh @@ -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"