From 6c09bd0bbaef8cb8b9bad75099248102b44f9bae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 22 Feb 2019 23:46:58 +0200 Subject: [PATCH] lib/pre-rubygems.rb is gone see https://github.com/hashicorp/vagrant/pull/7793 --- vagrant.sh | 8 ++------ vagrant.spec | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/vagrant.sh b/vagrant.sh index f738eaf..0c64e36 100755 --- a/vagrant.sh +++ b/vagrant.sh @@ -22,16 +22,12 @@ unset RUBYLIB # Find the Vagrant executable for needle in "${GEM_PATH}/gems/vagrant-"*; do - if [ -f "${needle}/lib/vagrant/pre-rubygems.rb" ]; then + if [ -f "${needle}/lib/vagrant/version.rb" ]; then VAGRANT_GEM_PATH="${needle}" fi done VAGRANT_EXECUTABLE="${VAGRANT_GEM_PATH}/bin/vagrant" -VAGRANT_LAUNCHER="${VAGRANT_GEM_PATH}/lib/vagrant/pre-rubygems.rb" - -# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit -export VAGRANT_EXECUTABLE # Call the actual Vagrant bin with our arguments -exec "${RUBY_EXECUTABLE}" "${VAGRANT_LAUNCHER}" "$@" +exec "$RUBY_EXECUTABLE" -r rubygems "$VAGRANT_EXECUTABLE" "$@" diff --git a/vagrant.spec b/vagrant.spec index fed3858..7ea417f 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -3,7 +3,7 @@ Summary: Provisioning and deployment of virtual instances Name: vagrant Version: 2.1.2 -Release: 3 +Release: 4 License: MIT Group: Applications/Emulators Source0: https://github.com/mitchellh/vagrant/archive/v%{version}/%{name}-%{version}.tar.gz -- 2.44.0