X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fb19cf980838b541a50af8a27ccf8058409b88e4..70fc6172691965ef197a902b18e490a069cfe2ae:/build/rails-package-scripts/postinst.sh

diff --git a/build/rails-package-scripts/postinst.sh b/build/rails-package-scripts/postinst.sh
index 1d426baa73..b5f78f988c 100644
--- a/build/rails-package-scripts/postinst.sh
+++ b/build/rails-package-scripts/postinst.sh
@@ -192,18 +192,14 @@ configure_version() {
   cd "$RELEASE_PATH"
   export RAILS_ENV=production
 
-  # We install Bundler itself in the same place where Bundler will install
-  # bundled gems, for a few reasons:
-  # 1. Bundler will probably want to do this anyway to run itself with the
-  #    specific version named in Gemfile.lock.
-  # 2. This is nicer to the sysadmin since we avoid messing with global state.
-  # 3. We can know exactly where the `bundle` command got installed.
-  local bundle_path="$SHARED_PATH/vendor_bundle"
-  export GEM_HOME="$bundle_path/ruby/$(ruby -e 'puts RUBY_VERSION')"
-  export GEM_PATH="$GEM_HOME"
   run_and_report "Installing bundler" gem install --conservative --version '~> 2.4.0' bundler
-  local bundle="$GEM_HOME/bin/bundle"
+  local bundle="$(gem contents --version '~> 2.4.0' bundler | grep '/exe/bundle$' | tail -n1)"
+  if ! [ -x "$bundle" ]; then
+      echo "Error: failed to find \`bundle\` command after installing bundler gem" >&2
+      return 1
+  fi
 
+  local bundle_path="$SHARED_PATH/vendor_bundle"
   run_and_report "Running bundle config set --local path $SHARED_PATH/vendor_bundle" \
                  "$bundle" config set --local path "$bundle_path"
 
@@ -212,10 +208,8 @@ configure_version() {
   # fail later. Work around this by installing all gems manually.
   find vendor/cache -maxdepth 1 -name '*.gem' -print0 \
       | run_and_report "Installing bundle gems" xargs -0r \
-                       gem install --conservative --ignore-dependencies --local --quiet
-  # The earlier `bundle config` should have it looking for installed gems in
-  # the right place. Unset GEM_* now to be sure.
-  unset GEM_HOME GEM_PATH
+                       gem install --conservative --ignore-dependencies --local --quiet \
+                       --install-dir="$bundle_path/ruby/$(ruby -e 'puts RUBY_VERSION')"
   run_and_report "Running bundle install" "$bundle" install --prefer-local --quiet
   run_and_report "Verifying bundle is complete" "$bundle" exec true
 
@@ -254,8 +248,6 @@ configure_version() {
 
   chown -R "$WWW_OWNER:" $RELEASE_PATH/tmp
 
-  setup_before_nginx_restart
-
   if [ -n "$SERVICE_MANAGER" ]; then
       service_command "$SERVICE_MANAGER" restart "$WEB_SERVICE"
   fi