[arch-commits] Commit in gitlab-shell/trunk (3 files)

[Sven-Hendrik Haase]

    Date: Tuesday, October 29, 2019 @ 08:40:57
  Author: svenstaro
Revision: 520880

upgpkg: gitlab-shell 2:10.2.0-2

Try to fix FS#64251

Modified:
  gitlab-shell/trunk/PKGBUILD
  gitlab-shell/trunk/gitlab-shell.install
  gitlab-shell/trunk/gitlab-shell.sysusers

-----------------------+
 PKGBUILD              |    7 +++++--
 gitlab-shell.install  |    2 +-
 gitlab-shell.sysusers |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-29 08:23:32 UTC (rev 520879)
+++ PKGBUILD	2019-10-29 08:40:57 UTC (rev 520880)
@@ -12,7 +12,7 @@
 # need this again at some point in the future.
 pkgname=gitlab-shell
 pkgver=10.2.0
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc="Git management software"
 arch=('x86_64')
@@ -32,7 +32,7 @@
         "gitlab-shell.sysusers")
 sha512sums=('2be081d2617409dd5612d0d44a42e5e88959fe267f1775313e5a43cb6acf3d737978189d7ba270c99bf3fb1d59e4ec701e74e9f89f3d2aaf54ce548ce8c16f35'
             '5caafe5300621ced58479e724b39656afc17f32a64ecde5dfa4919683ef37d9121552c78f066678472acb56e0a34b5c3cf34d9b44414d1ed5d91f725d180fa43'
-            '196fd5519f1019815562da5b8bfde1d8082614cee6e63d75a7bb673db8b3c409384177dcf3dd0436c2adeec273b4ffea690058c2c457ae6a82d4f805e860495f')
+            '616188911fa7b7c569bc2d5e2024177e67366c48b4ffef1f7ad4dc8e4e9e2cdb421b687f45a1e9bdec8bf2736a157ca9f1e0ba24edae2f073b8c7b5ac42745e8')
 
 _datadir="/usr/share/webapps/${pkgname}"
 _etcdir="/etc/webapps/${pkgname}"
@@ -92,6 +92,9 @@
   cp -r VERSION bin hooks spec support "${pkgdir}${_datadir}"
   ln -fs "${_datadir}" "${pkgdir}/${_homedir}/"
 
+  # Compatibility for FS#64251
+  ln -s gitlab-shell "$pkgdir"/${_datadir}/bin/gitlab-shell-ruby
+
   install -dm2770 -o 105 -g 105 "${pkgdir}${_homedir}/repositories"
 
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

Modified: gitlab-shell.install
===================================================================
--- gitlab-shell.install	2019-10-29 08:23:32 UTC (rev 520879)
+++ gitlab-shell.install	2019-10-29 08:40:57 UTC (rev 520880)
@@ -5,5 +5,5 @@
 
 post_upgrade() {
     echo "If you have previously installed gitlab-shell and now git pull fails on a repo, try changing the shell:"
-    echo "usermod -s /usr/share/webapps/gitlab-shell/bin/gitlab-shell-ruby gitlab"
+    echo "usermod -s /usr/share/webapps/gitlab-shell/bin/gitlab-shell gitlab"
 }

Modified: gitlab-shell.sysusers
===================================================================
--- gitlab-shell.sysusers	2019-10-29 08:23:32 UTC (rev 520879)
+++ gitlab-shell.sysusers	2019-10-29 08:40:57 UTC (rev 520880)
@@ -1 +1 @@
-u gitlab 105 - /var/lib/gitlab /usr/share/webapps/gitlab-shell/bin/gitlab-shell-ruby
+u gitlab 105 - /var/lib/gitlab /usr/share/webapps/gitlab-shell/bin/gitlab-shell