13 files changed, 17 insertions, 16 deletions
diff --git a/sources/db/update_characters.rb b/sources/db/update_characters.rb
index 1b2faaf..826e392 100755
--- a/sources/db/update_characters.rb
+++ b/sources/db/update_characters.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #------------------------------------------------------------------------------
 #
 #  Taginfo source: DB
diff --git a/sources/josm/import_josm.rb b/sources/josm/import_josm.rb
index 5ed7a38..aa82e3e 100755
--- a/sources/josm/import_josm.rb
+++ b/sources/josm/import_josm.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #------------------------------------------------------------------------------
 #
 #  Taginfo source: JOSM
diff --git a/sources/languages/import_subtag_registry.rb b/sources/languages/import_subtag_registry.rb
index 300b0fb..2a4abc1 100755
--- a/sources/languages/import_subtag_registry.rb
+++ b/sources/languages/import_subtag_registry.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #------------------------------------------------------------------------------
 #
 #  Taginfo source: Languages
diff --git a/sources/languages/import_unicode_scripts.rb b/sources/languages/import_unicode_scripts.rb
index e946983..b755527 100755
--- a/sources/languages/import_unicode_scripts.rb
+++ b/sources/languages/import_unicode_scripts.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #------------------------------------------------------------------------------
 #
 #  Taginfo source: Languages
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/potlatch/import_potlatch.rb b/sources/potlatch/import_potlatch.rb
index c63670d..11a73e9 100755
--- a/sources/potlatch/import_potlatch.rb
+++ b/sources/potlatch/import_potlatch.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #------------------------------------------------------------------------------
 #
 #  Taginfo source: Potlatch
diff --git a/sources/projects/import.rb b/sources/projects/import.rb
index 46ebc60..5b1f0b4 100755
--- a/sources/projects/import.rb
+++ b/sources/projects/import.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #------------------------------------------------------------------------------
 #
 #  Taginfo source: Projects
diff --git a/sources/projects/parse.rb b/sources/projects/parse.rb
index 40bd288..f077a70 100755
--- a/sources/projects/parse.rb
+++ b/sources/projects/parse.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #------------------------------------------------------------------------------
 #
 #  Taginfo source: Projects
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
diff --git a/sources/wiki/extract_words.rb b/sources/wiki/extract_words.rb
index 8f2fa16..c1c5279 100755
--- a/sources/wiki/extract_words.rb
+++ b/sources/wiki/extract_words.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #------------------------------------------------------------------------------
 #
 #  extract_words.rb [DIR]
diff --git a/sources/wiki/get_image_info.rb b/sources/wiki/get_image_info.rb
index 6254208..7d37528 100755
--- a/sources/wiki/get_image_info.rb
+++ b/sources/wiki/get_image_info.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #------------------------------------------------------------------------------
 #
 #  get_image_info.rb [DIR]
diff --git a/sources/wiki/get_page_list.rb b/sources/wiki/get_page_list.rb
index 8174812..4409f3f 100755
--- a/sources/wiki/get_page_list.rb
+++ b/sources/wiki/get_page_list.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #------------------------------------------------------------------------------
 #
 #  get_page_list.rb [DIR]
diff --git a/sources/wiki/get_wiki_data.rb b/sources/wiki/get_wiki_data.rb
index e63f39e..4d8029c 100755
--- a/sources/wiki/get_wiki_data.rb
+++ b/sources/wiki/get_wiki_data.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #------------------------------------------------------------------------------
 #
 #  get_wiki_data.rb [DIR]