From 9f5ad85b6ff541a8e4dc83e91548af9c745d64af Mon Sep 17 00:00:00 2001 From: Robin Houston Date: Thu, 31 May 2012 11:03:45 +0100 Subject: =?UTF-8?q?Let=E2=80=99s=20try=20fixing=20bundler=20instead?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of trying to work around the bug in bundler, what if we fixed it? --- script/rails-post-deploy | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'script/rails-post-deploy') 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 -- cgit v1.2.3