diff options
Diffstat (limited to 'script')
| -rwxr-xr-x | script/handle-mail-replies.rb | 8 | ||||
| -rwxr-xr-x | script/mailin | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb index 23430e20a..be6bd10da 100755 --- a/script/handle-mail-replies.rb +++ b/script/handle-mail-replies.rb @@ -14,13 +14,13 @@ # config file ourselves. $alaveteli_dir = File.expand_path(File.join(File.dirname(__FILE__), '..')) $:.push(File.join($alaveteli_dir, "commonlib", "rblib")) +load 'config.rb' $:.push(File.join($alaveteli_dir, "lib")) $:.push(File.join($alaveteli_dir, "lib", "mail_handler")) +load 'configuration.rb' +MySociety::Config.set_file(File.join($alaveteli_dir, 'config', 'general'), true) +MySociety::Config.load_default require 'mail_handler' -if RUBY_VERSION.to_f >= 1.9 - # the default encoding for IO is utf-8, and we use utf-8 internally - Encoding.default_external = Encoding.default_internal = Encoding::UTF_8 -end def main(in_test_mode) Dir.chdir($alaveteli_dir) do diff --git a/script/mailin b/script/mailin index 6ed6bc7db..f782df215 100755 --- a/script/mailin +++ b/script/mailin @@ -13,7 +13,7 @@ source commonlib/shlib/deployfns read_conf config/general -rails runner 'RequestMailer.receive(STDIN.read)' <"$INPUT" >"$OUTPUT" 2>&1 +bundle exec rails runner 'RequestMailer.receive(STDIN.read)' <"$INPUT" >"$OUTPUT" 2>&1 ERROR_CODE=$? if [ ! "$ERROR_CODE" = "0" ] then |