From 211ad09a3962946435369bc15a471320e3b13e70 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 23 Sep 2016 14:39:52 +0200
Subject: [PATCH] nominatim: run updates from build dir

---
 cookbooks/nominatim/recipes/base.rb               | 3 ++-
 cookbooks/nominatim/recipes/default.rb            | 3 ++-
 cookbooks/nominatim/templates/default/updater.erb | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb
index 7a473b9cc..9a3252c72 100644
--- a/cookbooks/nominatim/recipes/base.rb
+++ b/cookbooks/nominatim/recipes/base.rb
@@ -195,7 +195,8 @@ template "#{source_directory}/utils/nominatim-update" do
   user "nominatim"
   group "nominatim"
   mode 0o755
-  variables :logfile => "#{node[:nominatim][:logdir]}/update.log",
+  variables :bindir => source_directory,
+            :logfile => "#{node[:nominatim][:logdir]}/update.log",
             :branch => node[:nominatim][:revision],
             :update_stop_file => "#{home_directory}/status/updates_disabled"
 end
diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 00bfb2715..2e5887b5a 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -243,7 +243,8 @@ template "#{source_directory}/utils/nominatim-update" do
   user "nominatim"
   group "nominatim"
   mode 0o755
-  variables :logfile => "#{node[:nominatim][:logdir]}/update.log",
+  variables :bindir => build_directory,
+            :logfile => "#{node[:nominatim][:logdir]}/update.log",
             :branch => node[:nominatim][:revision],
             :update_stop_file => "#{basedir}/status/updates_disabled"
 end
diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index b259c4ed6..5c5a4448b 100644
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -3,8 +3,7 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # Change to Nominatim directory
-DIR="$( cd "$( dirname "$0" )" && pwd )"
-cd $DIR/..
+cd <%= @bindir %>
 
 while [ ! -f "<%= @update_stop_file %>" ]
 do
-- 
2.43.2