diff options
| -rwxr-xr-x | sources/master/update.sh | 9 | ||||
| -rwxr-xr-x | sources/update_all.sh | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sources/master/update.sh b/sources/master/update.sh index 12c3ad4..e4ccaba 100755 --- a/sources/master/update.sh +++ b/sources/master/update.sh @@ -9,6 +9,7 @@ set -e DIR=$1 +[ -n "$M4" ] || M4=m4 DATECMD='date +%Y-%m-%dT%H:%M:%S' if [ "x" = "x$DIR" ]; then @@ -25,13 +26,13 @@ SELECTION_DB=$DIR/selection.db echo "`$DATECMD` Create search database..." rm -f $DIR/taginfo-search.db -m4 --prefix-builtins -D __DIR__=$DIR search.sql | sqlite3 $DIR/taginfo-search.db +$M4 --prefix-builtins -D __DIR__=$DIR search.sql | sqlite3 $DIR/taginfo-search.db echo "`$DATECMD` Create master database..." rm -f $MASTER_DB sqlite3 $MASTER_DB <languages.sql -m4 --prefix-builtins -D __DIR__=$DIR master.sql | sqlite3 $MASTER_DB +$M4 --prefix-builtins -D __DIR__=$DIR master.sql | sqlite3 $MASTER_DB echo "`$DATECMD` Create selection database..." @@ -40,7 +41,7 @@ min_count_for_map=`../../bin/taginfo-config.rb sources.master.min_count_for_map min_count_relations_per_type=`../../bin/taginfo-config.rb sources.master.min_count_relations_per_type 100` rm -f $SELECTION_DB -m4 --prefix-builtins \ +$M4 --prefix-builtins \ -D __DIR__=$DIR \ -D __MIN_COUNT_FOR_MAP__=$min_count_for_map \ -D __MIN_COUNT_TAGS__=$min_count_tags \ @@ -56,7 +57,7 @@ if [ ! -e $HISTORY_DB ]; then sqlite3 $HISTORY_DB < history_init.sql fi -m4 --prefix-builtins -D __DIR__=$DIR history_update.sql | sqlite3 $HISTORY_DB +$M4 --prefix-builtins -D __DIR__=$DIR history_update.sql | sqlite3 $HISTORY_DB echo "`$DATECMD` Done master." diff --git a/sources/update_all.sh b/sources/update_all.sh index dfe31c6..b511ecd 100755 --- a/sources/update_all.sh +++ b/sources/update_all.sh @@ -50,7 +50,7 @@ for source in $SOURCES_DOWNLOAD; do echo "=====================================" echo "Downloading $source..." mkdir -p $DIR/$source - curl --silent --fail --output $DIR/download/taginfo-$source.db.bz2 http://taginfo.openstreetmap.org/download/taginfo-$source.db.bz2 + curl --silent --fail --output $DIR/download/taginfo-$source.db.bz2 --time-cond $DIR/download/taginfo-$source.db.bz2 http://taginfo.openstreetmap.org/download/taginfo-$source.db.bz2 bzcat $DIR/download/taginfo-$source.db.bz2 >$DIR/$source/taginfo-$source.db echo "Done." done |