defolos/vagrant
SHA256
1
0
Fork 0
forked from pool/vagrant
Code Pull Requests Activity

Accepting request 806993 from home:dancermak:branches:Virtualization:vagrant

Browse Source 
Use the correct ruby in the vagrant binstub as well

OBS-URL: https://build.opensuse.org/request/show/806993
OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=44
This commit is contained in:
Johannes Kastl 2020-05-19 04:59:51 +00:00 committed by Git OBS Bridge
parent dff50cb13f
commit a9581aca36
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
binstub
View File

@ -57,5 +57,4 @@ fi
export VAGRANT_DISABLE_VBOXSYMLINKCREATE export VAGRANT_DISABLE_VBOXSYMLINKCREATE
# Call the actual Vagrant bin with our arguments # Call the actual Vagrant bin with our arguments
exec ruby "${VAGRANT_EXECUTABLE}" "$@" exec /usr/bin/ruby.@vagrant_rb_ruby_suffix@ "${VAGRANT_EXECUTABLE}" "$@"

5
vagrant.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 18 14:17:46 UTC 2020 - Dan Čermák <dcermak@suse.com>
- Use the correct ruby in the vagrant binstub as well
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 11 17:58:59 UTC 2020 - Dan Čermák <dcermak@suse.com> Mon May 11 17:58:59 UTC 2020 - Dan Čermák <dcermak@suse.com>

17
vagrant.spec
View File

@ -306,18 +306,21 @@ CONFIGURE_ARGS="--with-cflags='%{optflags}' $CONFIGURE_ARGS"
# the actual vagrant binary generated from the binstub # the actual vagrant binary generated from the binstub
install -D -m 755 %{SOURCE96} %{buildroot}%{_bindir}/vagrant install -D -m 755 %{SOURCE96} %{buildroot}%{_bindir}/vagrant
sed -i 's|@vagrant_embedded_dir@|%{vagrant_embedded_dir}|' %{buildroot}%{_bindir}/vagrant
gem_path=$(ruby.%{rb_ruby_suffix} -e "print Gem.path.reject{|path| path.include? 'home'}.join(':')") gem_path=$(ruby.%{rb_ruby_suffix} -e "print Gem.path.reject{|path| path.include? 'home'}.join(':')")
sed -i "s|@ruby_vagrant_gem_path@|$gem_path:%{vagrant_plugin_dir}|" %{buildroot}%{_bindir}/vagrant sed -i -e "s|@vagrant_embedded_dir@|%{vagrant_embedded_dir}|" \
-e "s|@ruby_vagrant_gem_path@|$gem_path:%{vagrant_plugin_dir}|" \
-e "s|@vagrant_rb_ruby_suffix@|%{vagrant_rb_ruby_suffix}|" \
%{buildroot}%{_bindir}/%{name}
# install the rpm macros & expand the name, name-version and vagrant_rb_* macros # install the rpm macros & expand the name, name-version and vagrant_rb_* macros
%global macros_vagrant %{_rpmconfigdir}/macros.d/macros.%{name} %global macros_vagrant %{_rpmconfigdir}/macros.d/macros.%{name}
install -D -m 0644 %{SOURCE97} %{buildroot}%{macros_vagrant} install -D -m 0644 %{SOURCE97} %{buildroot}%{macros_vagrant}
sed -i "s|%%{name}|%{name}|" %{buildroot}%{macros_vagrant} sed -i -e "s|%%{name}|%{name}|" \
sed -i "s|%{name}-%%{version}|%{name}-%{version}|" %{buildroot}%{macros_vagrant} -e "s|%{name}-%%{version}|%{name}-%{version}|" \
sed -i "s|%%{rb_build_versions}|%{rb_build_versions}|" %{buildroot}%{macros_vagrant} -e "s|%%{rb_build_versions}|%{rb_build_versions}|" \
sed -i "s|%%{rb_build_abi}|%{rb_build_abi}|" %{buildroot}%{macros_vagrant} -e "s|%%{rb_build_abi}|%{rb_build_abi}|" \
sed -i "s|%%{rb_ruby_suffix}|%{rb_ruby_suffix}|" %{buildroot}%{macros_vagrant} -e "s|%%{rb_ruby_suffix}|%{rb_ruby_suffix}|" \
%{buildroot}%{macros_vagrant}
# install post, transfiletrigerin & transfiletriggerun scriptlets # install post, transfiletrigerin & transfiletriggerun scriptlets
%global post_rb %{vagrant_embedded_dir}/bin/vagrant_post.rb %global post_rb %{vagrant_embedded_dir}/bin/vagrant_post.rb