Merge branch 'release/0.5' into develop

Conflicts:
	lib/alaveteli_external_command.rb

1 files changed, 17 insertions, 2 deletions

diff --git a/lib/alaveteli_external_command.rb b/lib/alaveteli_external_command.rb
index 0144d75c2..b1d4f17d1 100644
--- a/lib/alaveteli_external_command.rb
+++ b/lib/alaveteli_external_command.rb
@@ -11,11 +11,26 @@ module AlaveteliExternalCommand
                 opts = args.pop
             end
             
-            xc = ExternalCommand.new(program_name, *args)
+            if program_name =~ %r(^/)
+                program_path = program_name
+            else
+                utility_search_path = MySociety::Config.get("UTILITY_SEARCH_PATH", ["/usr/bin", "/usr/local/bin"])
+                found = false
+                utility_search_path.each do |d|
+                    program_path = File.join(d, program_name)
+                    if File.file? program_path and File.executable? program_path
+                        found = true
+                        break
+                    end
+                end
+                 raise "Could not find #{program_name} in any of #{utility_search_path.join(', ')}" if !found
+            end
+            
+            xc = ExternalCommand.new(program_path, *args)
             if opts.has_key? :append_to
                 xc.out = opts[:append_to]
             end
-            xc.run(opts[:stdin_string])
+            xc.run(opts[:stdin_string], opts[:env] || {})
             if xc.status != 0
                 # Error
                 $stderr.puts("Error from #{program_name} #{args.join(' ')}:")