diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-05-31 11:03:45 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-05-31 11:03:45 +0100 |
| commit | 9f5ad85b6ff541a8e4dc83e91548af9c745d64af (patch) | |
| tree | e24a8b5129f5ef9806f8e7efbd39e7a7ea99ff47 /script/rails-post-deploy | |
| parent | 1b9ffa4563935bbd6b4dc0dec4ba5e085e355a12 (diff) | |
Let’s try fixing bundler instead
Instead of trying to work around the bug in bundler, what if we fixed it?
Diffstat (limited to 'script/rails-post-deploy')
| -rwxr-xr-x | script/rails-post-deploy | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/script/rails-post-deploy b/script/rails-post-deploy index a2761ecbc..193d0bbec 100755 --- a/script/rails-post-deploy +++ b/script/rails-post-deploy @@ -80,28 +80,7 @@ then bundle_install_options="--without development:test --deployment" fi -# Ordinarily we would expect simply to run "bundle install" here. -# However, at the time of writing there is a bug in bundler that -# causes gems from github to be rebuilt every time bundle install -# is run, which makes the process very extremely slow in our case -# because Xapian takes a long time to build. Running -# "bundle exec bundle install" is a workaround for this bug. -# -# However clearly one cannot run bundle exec till the bundle has -# initially been installed, so we use a flag file .bundler-has-run -# to indicate whether we are doing an initial install. -# -# If you ever need to rerun the initial install, just remove -# this flag file. -# -# https://groups.google.com/forum/?fromgroups#!topic/alaveteli-dev/lCDuW9H4uBI -if [ -e .bundler-has-run ] -then - bundle exec bundle install $bundle_install_options -else - bundle install $bundle_install_options - touch .bundler-has-run -fi +bundle install $bundle_install_options if [ -n "$OPTION_THEME_URLS" ] then |