diff options
Diffstat (limited to 'script')
| -rwxr-xr-x | script/handle-mail-replies | 8 | ||||
| -rwxr-xr-x | script/rails-post-deploy | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/script/handle-mail-replies b/script/handle-mail-replies index 68cab9035..d6717bc58 100755 --- a/script/handle-mail-replies +++ b/script/handle-mail-replies @@ -18,13 +18,7 @@ load "config.rb" MySociety::Config.set_file(File.join($alaveteli_dir, 'config', 'general'), true) MySociety::Config.load_default -require 'rubygems' -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 +require 'action_mailer' def main(in_test_mode) Dir.chdir($alaveteli_dir) do diff --git a/script/rails-post-deploy b/script/rails-post-deploy index d9e9bb3f1..2bf098c5d 100755 --- a/script/rails-post-deploy +++ b/script/rails-post-deploy @@ -74,6 +74,13 @@ then echo "ENV['RAILS_ENV'] ||= 'production'" > config/rails_env.rb fi +if [ "$OPTION_STAGING_SITE" = "0" ] +then + bundle install --deployment +else + bundle install +fi + if [ -n "$OPTION_THEME_URL" ] then script/plugin install --force $OPTION_THEME_URL |