From 62817c9ea3f5838c850532ad875952d1bff34ad6 Mon Sep 17 00:00:00 2001 From: James McKinney Date: Sun, 16 Oct 2011 20:42:55 -0400 Subject: fix a few more paths --- script/handle-mail-replies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'script/handle-mail-replies') diff --git a/script/handle-mail-replies b/script/handle-mail-replies index 9b1fb5b29..3ab8ad4f1 100755 --- a/script/handle-mail-replies +++ b/script/handle-mail-replies @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/env ruby # Handle email responses sent to us. # -- cgit v1.2.3 From ea69b6a362cf71d7a86f0a0a9e4efa1183370546 Mon Sep 17 00:00:00 2001 From: James McKinney Date: Mon, 17 Oct 2011 02:18:48 -0400 Subject: remove last hardcoding of vendor/rails --- script/handle-mail-replies | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'script/handle-mail-replies') diff --git a/script/handle-mail-replies b/script/handle-mail-replies index 9b1fb5b29..fe7560de7 100755 --- a/script/handle-mail-replies +++ b/script/handle-mail-replies @@ -17,8 +17,8 @@ load "config.rb" MySociety::Config.set_file(File.join($alaveteli_dir, 'config', 'general'), true) MySociety::Config.load_default -$:.push(File.join($alaveteli_dir, "vendor", "rails", "actionmailer", "lib", "action_mailer", "vendor", "tmail-1.2.7")) -require 'tmail' +require 'rubygems' +require 'action_mailer' def main(in_test_mode) Dir.chdir($alaveteli_dir) do -- cgit v1.2.3 From 589d9b8c1e14bb7086a6b7baf0fa7e3b9aaeabf0 Mon Sep 17 00:00:00 2001 From: Seb Bacon Date: Thu, 24 Nov 2011 12:17:26 +0000 Subject: Cater for reliance on vendored Rails as well as un-vendored. Fixes bug introduced in issue #276. --- script/handle-mail-replies | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'script/handle-mail-replies') diff --git a/script/handle-mail-replies b/script/handle-mail-replies index 62e663372..9451bc9f2 100755 --- a/script/handle-mail-replies +++ b/script/handle-mail-replies @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# -*- coding: utf-8 -*- # Handle email responses sent to us. # @@ -18,7 +19,12 @@ MySociety::Config.set_file(File.join($alaveteli_dir, 'config', 'general'), true) MySociety::Config.load_default require 'rubygems' -require 'action_mailer' +if File.exist? File.join($alaveteli_dir,'vendor','rails','Rakefile') + $:.push(File.join($alaveteli_dir, "vendor", "rails", "actionmailer", "lib", "action_mailer", "vendor", "tmail-1.2.7")) + require 'tmail' +else + require 'action_mailer' +end def main(in_test_mode) Dir.chdir($alaveteli_dir) do -- cgit v1.2.3