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

Andreas Radke andyrtr at archlinux.org
Wed Sep 25 17:36:26 UTC 2019


    Date: Wednesday, September 25, 2019 @ 17:36:26
  Author: andyrtr
Revision: 363397

fix quoting

Modified:
  x2goserver/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-25 17:34:14 UTC (rev 363396)
+++ PKGBUILD	2019-09-25 17:36:26 UTC (rev 363397)
@@ -88,7 +88,7 @@
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git Administrator <git-admin at x2go.org>
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   # -r option does not exist in Arch linux
   # (However, html man pages do not get installed anyway...)
@@ -108,31 +108,30 @@
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
 
   # systemd files
   install -Dm 644 "$srcdir/${pkgname}-${pkgver}/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
   # overwrite upstream systemd tmofile "x /tmp/.x2go-*" with ours
-#  install -Dm644 ../tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/x2goserver.conf
-  cat ../tmpfiles.d >> ${pkgdir}/usr/lib/tmpfiles.d/x2goserver.conf
-  install -Dm644 ../sysusers.d ${pkgdir}/usr/lib/sysusers.d/x2goserver.conf
+  cat ../tmpfiles.d >> "${pkgdir}"/usr/lib/tmpfiles.d/x2goserver.conf
+  install -Dm644 ../sysusers.d "${pkgdir}"/usr/lib/sysusers.d/x2goserver.conf
   
   # load fuse module at system start
-  install -dm755 $pkgdir/usr/lib/modules-load.d
-  echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf
+  install -dm755 "$pkgdir"/usr/lib/modules-load.d
+  echo "fuse" > "$pkgdir"/usr/lib/modules-load.d/x2goserver.conf
 
   install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
   install -m 644 "ChangeLog" "${pkgdir}/usr/share/doc/${pkgname}/"
 
   # fix permission - see INSTALL file
-  chown root:111 ${pkgdir}/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
-  chmod 2755 ${pkgdir}/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+  chown root:111 "${pkgdir}"/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+  chmod 2755 "${pkgdir}"/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
   
-  chown root:112 ${pkgdir}/usr/bin/x2goprint
-  chmod 2755 ${pkgdir}/usr/bin/x2goprint
+  chown root:112 "${pkgdir}"/usr/bin/x2goprint
+  chmod 2755 "${pkgdir}"/usr/bin/x2goprint
   
-  chmod 750 ${pkgdir}/etc/sudoers.d
-  chmod 0440 ${pkgdir}/etc/sudoers.d/x2goserver
+  chmod 750 "${pkgdir}"/etc/sudoers.d
+  chmod 0440 "${pkgdir}"/etc/sudoers.d/x2goserver
 }
 



More information about the arch-commits mailing list