X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7aa1c692da44b5441554522d486e01aa02b27c3a..3ae5b9b4fbb5a637df5a9e8138cd421e0c6e74e7:/cookbooks/nominatim/templates/default/updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index 2c553ad21..2f75b4199 100644
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -3,7 +3,7 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # Send output to the log
-exec > /var/log/nominatim/update.log 2>&1
+exec >> /var/log/nominatim/update.log 2>&1
 
 # Change to Nominatim directory
 DIR="$( cd "$( dirname "$0" )" && pwd )"
@@ -15,13 +15,17 @@ do
 
     ./utils/update.php --no-npi --import-osmosis
 
-    # will trigger recompilation if necessary
-    git pull
+    if git fetch origin; then
+      # will trigger recompilation if necessary
+      git merge origin/master
+    else
+      echo "WARNING: git fetch failed."
+    fi
 
     # sleep a bit if updates take less than a minute
     endtime=`date +%s`
     elapsed=$((endtime - starttime))
-    if [[ $elapsed < 60 ]]
+    if [[ $elapsed -lt 60 ]]
     then
         sleepy=$((60 - $elapsed))
         echo "Sleeping for ${sleepy}s..."