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

[Anatol Pomozov]

    Date: Friday, March 27, 2020 @ 18:42:10
  Author: anatolik
Revision: 605040

Use gitlab string instead of pkgname variable

Modified:
  gitlab/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-27 18:29:28 UTC (rev 605039)
+++ PKGBUILD	2020-03-27 18:42:10 UTC (rev 605040)
@@ -22,11 +22,11 @@
 optdepends=('postgresql: database backend'
             'python-docutils: reStructuredText markup language support'
             'smtp-server: mail server in order to receive mail notifications')
-backup=("etc/webapps/${pkgname}/application.rb"
-        "etc/webapps/${pkgname}/gitlab.yml"
-        "etc/webapps/${pkgname}/resque.yml"
-        "etc/webapps/${pkgname}/unicorn.rb"
-        "etc/logrotate.d/${pkgname}")
+backup=("etc/webapps/gitlab/application.rb"
+        "etc/webapps/gitlab/gitlab.yml"
+        "etc/webapps/gitlab/resque.yml"
+        "etc/webapps/gitlab/unicorn.rb"
+        "etc/logrotate.d/gitlab")
 source=(git+https://gitlab.com/gitlab-org/gitlab-foss.git#tag=v$pkgver
         build_fix.patch
         gitlab-unicorn.service
@@ -52,10 +52,10 @@
             '0cc5c1df3cd18978df9a01bb64680d3a375c1ff4de6a453045dd26355777b4f08e3a05f55f035c8012a9683100de0bc3d11c280debcb343eb7167fc25342d5c0')
 
 
-_datadir="/usr/share/webapps/${pkgname}"
-_etcdir="/etc/webapps/${pkgname}"
-_homedir="/var/lib/${pkgname}"
-_logdir="/var/log/${pkgname}"
+_datadir="/usr/share/webapps/gitlab"
+_etcdir="/etc/webapps/gitlab"
+_homedir="/var/lib/gitlab"
+_logdir="/var/log/gitlab"
 
 prepare() {
   # Get first 7 characters from sha1 which has 40 characters in total
@@ -167,7 +167,7 @@
   install -dm700 -o 105 -g 105 "${pkgdir}${_homedir}/uploads"
   install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}/backups"
   install -dm750 -o 105 -g 105 "${pkgdir}${_etcdir}"
-  install -dm755 "${pkgdir}/usr/share/doc/${pkgname}"
+  install -dm755 "${pkgdir}/usr/share/doc/gitlab"
 
   ln -fs /run/gitlab "${pkgdir}${_homedir}/pids"
   ln -fs /run/gitlab "${pkgdir}${_homedir}/sockets"
@@ -204,8 +204,8 @@
   ln -fs "${_etcdir}/secrets.yml" "${pkgdir}${_datadir}/config/secrets.yml"
 
   # Install license and help files
-  mv README.md MAINTENANCE.md CONTRIBUTING.md CHANGELOG.md PROCESS.md VERSION config/*.{example,postgresql} "${pkgdir}/usr/share/doc/${pkgname}"
-  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  mv README.md MAINTENANCE.md CONTRIBUTING.md CHANGELOG.md PROCESS.md VERSION config/*.{example,postgresql} "${pkgdir}/usr/share/doc/gitlab"
+  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/gitlab/LICENSE"
 
   # https://gitlab.com/gitlab-org/gitlab-foss/issues/765
   cp -r "${pkgdir}${_datadir}/doc" "${pkgdir}${_datadir}/public/help"