diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-05-15 17:01:22 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-05-15 17:01:22 +0100 |
| commit | bb5f95040d377d86629012347343fbf2c7dda016 (patch) | |
| tree | be696ec2615b098db34449a982fcb09a68c9c49b /script/rails-deploy-before-down | |
| parent | 6d215fba5cc709c43f12f86da39a643e4be5922b (diff) | |
| parent | 21027d0d1197e7ac447296ab68a25159860888b2 (diff) | |
Merge remote-tracking branch 'origin/release/0.18'0.18
Diffstat (limited to 'script/rails-deploy-before-down')
| -rwxr-xr-x | script/rails-deploy-before-down | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/script/rails-deploy-before-down b/script/rails-deploy-before-down index ad1049e44..42284b00d 100755 --- a/script/rails-deploy-before-down +++ b/script/rails-deploy-before-down @@ -123,20 +123,30 @@ END echo "ENV['RAILS_ENV'] ||= 'production'" > config/rails_env.rb fi -bundle_install_options="" +BUNDLE_PATH="${OPTION_BUNDLE_PATH:-vendor/bundle}" + +bundle_install_options="--path $BUNDLE_PATH" + if [ "$OPTION_STAGING_SITE" = "0" ] then - bundle_install_options="--without development:test --deployment" + bundle_install_options="$bundle_install_options --without development debug test --deployment" fi if [ "$OPTION_STAGING_SITE" = "1" ] then - bundle_install_options="--path vendor/bundle" + bundle_install_options="$bundle_install_options" fi + +# Use script/wad to install bundle when on Travis if [ "$TRAVIS" = "true" ] then - bundle_install_options="--without development develop --deployment" + script/wad +fi + +if [ ! "$TRAVIS" = "true" ] +then + echo "Running bundle install with options: $bundle_install_options" + bundle install $bundle_install_options fi -bundle install $bundle_install_options bundle exec rake submodules:check |