diff options
| author | Jochen Topf <jochen@topf.org> | 2014-12-06 16:29:06 +0100 |
|---|---|---|
| committer | Jochen Topf <jochen@topf.org> | 2014-12-06 16:29:06 +0100 |
| commit | a4b359e4e2599cccbddee1e1c007bc31e134b222 (patch) | |
| tree | 22fab0c3963288fcd1ae4ebdeaaa284337da2d22 /sources | |
| parent | f9994a2346cab060274946a82c444d087f67b523 (diff) | |
| parent | f1d62c8f83b4860127a5a9e19032df8892c468c8 (diff) | |
| download | taginfo-a4b359e4e2599cccbddee1e1c007bc31e134b222.tar taginfo-a4b359e4e2599cccbddee1e1c007bc31e134b222.tar.gz | |
Merge pull request #95 from kcwu/fix-gnu-m4
Make the update script more portable
Diffstat (limited to 'sources')
| -rwxr-xr-x | sources/master/update.sh | 9 |
1 files changed, 5 insertions, 4 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." |