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

[Jonathan Steel]

    Date: Wednesday, January 3, 2018 @ 13:26:46
  Author: jsteel
Revision: 278215

upgpkg: vagrant 2.0.1-2

Switch to ruby2.3 as vagrant doesn't work with 2.5

Modified:
  vagrant/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-03 13:02:27 UTC (rev 278214)
+++ PKGBUILD	2018-01-03 13:26:46 UTC (rev 278215)
@@ -11,7 +11,7 @@
 
 pkgname=vagrant
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Build and distribute virtualized development environments"
 arch=('x86_64')
 url="https://vagrantup.com"
@@ -18,7 +18,7 @@
 license=('MIT')
 options=('!emptydirs')
 depends=('curl' 'libarchive' 'libssh2' 'libxml2' 'libxslt' 'rsync'
-         'ruby' 'xz')
+         'ruby2.3' 'xz')
 makedepends=('git' 'go-pie')
 conflicts=('vagrant-substrate')
 replaces=('vagrant-substrate')
@@ -27,12 +27,17 @@
 md5sums=('c443ac9e1034d5748b81f01da548d587'
          'SKIP')
 
+prepare() {
+  cd vagrant-installers/substrate/modules/vagrant_substrate
+  sed -i 's_"/usr/bin/ruby"_"/usr/bin/ruby-2.3"_' files/launcher/main.go
+}
+
 build() {
   cd $pkgname-$pkgver
 
   INSTALLERS_DIR="$srcdir"/vagrant-installers/substrate/modules
 
-  gem build $pkgname.gemspec
+  gem-2.3 build $pkgname.gemspec
 
   cd "$INSTALLERS_DIR"/vagrant_substrate/files/launcher
   go get github.com/mitchellh/osext
@@ -54,7 +59,7 @@
 
   GEM_PATH="$EMBEDDED_DIR"/gems GEM_HOME="$GEM_PATH" \
   GEMRC="$EMBEDDED_DIR"/etc/gemrc \
-    gem install $pkgname-$pkgver.gem --no-ri --no-rdoc
+    gem-2.3 install $pkgname-$pkgver.gem --no-ri --no-rdoc
 
   install -Dm755 "$INSTALLERS_DIR"/vagrant_substrate/files/launcher/vagrant \
     "$pkgdir"/opt/$pkgname/bin/$pkgname