[arch-commits] Commit in vagrant/trunk (PKGBUILD)

[Jonathan Steel]

    Date: Saturday, August 27, 2022 @ 08:00:01
  Author: jsteel
Revision: 1284559

upgpkg: vagrant 2.3.0-7: Allow Vagrant to see the system gems

As these are being de-vendored from the ruby package

Modified:
  vagrant/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-27 07:55:48 UTC (rev 1284558)
+++ PKGBUILD	2022-08-27 08:00:01 UTC (rev 1284559)
@@ -10,7 +10,7 @@
 
 pkgname=vagrant
 pkgver=2.3.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Build and distribute virtualized development environments"
 arch=('x86_64')
 url="https://vagrantup.com"
@@ -26,6 +26,14 @@
 md5sums=('872b623fd3ba919185b4cc671ea7c20f'
          'SKIP')
 
+prepare() {
+  cd vagrant-installers
+  local _gemdir="$(gem env gemdir)"
+
+  # Allow Vagrant to see the system gems as these have been de-vendored from the ruby package
+  sed -i "s_\"gems\", vagrantVersion)_\"gems\", vagrantVersion, \":$_gemdir\")_g" substrate/launcher/main.go
+}
+
 build() {
   cd $pkgname-$pkgver
   gem build $pkgname.gemspec
@@ -48,11 +56,11 @@
   EMBEDDED_DIR="$pkgdir"/opt/vagrant/embedded
 
   install -d "$pkgdir"/usr/{bin,share/bash-completion/completions,share/zsh/site-functions}
-  install -d "$EMBEDDED_DIR"/gems
+  install -Dm644 "$INSTALLERS_DIR"/common/gemrc "$EMBEDDED_DIR"/etc/gemrc
 
   echo "{ \"vagrant_version\": \"$pkgver\" }" > "$EMBEDDED_DIR"/manifest.json
 
-  gem install $pkgname-$pkgver.gem cgi delegate ipaddr io-wait \
+  gem install $pkgname-$pkgver.gem \
     --no-document --no-user-install --install-dir "$EMBEDDED_DIR"/gems/$pkgver
 
   install -Dm755 "$INSTALLERS_DIR"/launcher/vagrant \