aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-06-07 16:33:04 +0100
committerRobin Houston <robin.houston@gmail.com>2012-06-07 16:33:04 +0100
commitb87da943c35345849d77f8e38e7a8d6de105e40e (patch)
tree8a52bfc4a35253ea2da70171a9f7919c262fd943
parent7e00dbd24942de1102201aeb150c01b76a9ef8be (diff)
Make handle-mail-replies tests pass again
-rwxr-xr-xscript/handle-mail-replies2
-rwxr-xr-xscript/handle-mail-replies.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/script/handle-mail-replies b/script/handle-mail-replies
index ad4b3719e..15454b311 100755
--- a/script/handle-mail-replies
+++ b/script/handle-mail-replies
@@ -1,4 +1,4 @@
#!/bin/bash
cd "`dirname "$0"`"
-exec bundle exec ./handle-mail-replies.rb
+exec bundle exec ./handle-mail-replies.rb "$@"
diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb
index cc15fe35a..05a934c76 100755
--- a/script/handle-mail-replies.rb
+++ b/script/handle-mail-replies.rb
@@ -166,8 +166,8 @@ def forward_on(raw_message)
end
def load_rails
- require File.join('config', 'boot')
- require Rails.root + '/config/environment'
+ require File.join($alaveteli_dir, 'config', 'boot')
+ require File.join(Rails.root, "config", "environment")
end
def record_bounce(email_address, bounce_message)