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

[Sven-Hendrik Haase]

    Date: Friday, May 27, 2016 @ 19:19:43
  Author: svenstaro
Revision: 177310

upgpkg: gitlab 8.8.2-3

Explicitly use ruby-2.1 and bundle-2.1 binary names

Modified:
  gitlab/trunk/PKGBUILD

----------+
 PKGBUILD |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-27 17:05:31 UTC (rev 177309)
+++ PKGBUILD	2016-05-27 17:19:43 UTC (rev 177310)
@@ -8,7 +8,7 @@
 
 pkgname=gitlab
 pkgver=8.8.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Project management and code hosting application"
 arch=('i686' 'x86_64')
 url="https://gitlab.com/gitlab-org/gitlab-ce/tree/master#README"
@@ -157,6 +157,10 @@
   ln -fs /etc/webapps/gitlab-shell/secret "${pkgdir}${_datadir}/.gitlab_shell_secret"
 
   sed -i "s|require_relative '../lib|require '${_datadir}/lib|" config/application.rb
+
+  # Fix for ruby-2.1 and bundle-2.1
+  sed -i "s|bundle|bundle-2.1|g" "${pkgdir}${_datadir}/lib/tasks/gitlab/check.rake"
+  grep -rl "bin/env ruby" "${pkgdir}${_datadir}" | xargs sed -i "s|bin/env ruby|bin/env ruby-2.1|g"
   
   # Install config files
   for config_file in application.rb gitlab.yml unicorn.rb resque.yml; do