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

Andreas Radke andyrtr at archlinux.org
Mon Sep 23 18:55:44 UTC 2019


    Date: Monday, September 23, 2019 @ 18:55:43
  Author: andyrtr
Revision: 363286

fix quoting

Modified:
  cups/trunk/PKGBUILD

----------+
 PKGBUILD |   70 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-23 18:50:37 UTC (rev 363285)
+++ PKGBUILD	2019-09-23 18:55:43 UTC (rev 363286)
@@ -35,20 +35,20 @@
 
 prepare() {
 
-  cd ${pkgbase}-${pkgver}
+  cd "${pkgbase}"-${pkgver}
 
   # improve build and linking
   # Do not export SSL libs in cups-config
-  patch -Np1 -i ${srcdir}/cups-no-export-ssllibs.patch
+  patch -Np1 -i "${srcdir}"/cups-no-export-ssllibs.patch
   # move /var/run -> /run for pid file
-  patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
+  patch -Np1 -i "${srcdir}"/cups-1.6.2-statedir.patch
 
   # bug fixes
   # make sure network is up when starting and notify systemd - FC
-  patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
+  patch -Np1 -i "${srcdir}"/cups-systemd-socket.patch
 
   # FS#56818 - https://github.com/apple/cups/issues/5236
-  patch -Np1 -i ${srcdir}/guid.patch
+  patch -Np1 -i "${srcdir}"/guid.patch
 
   # set MaxLogSize to 0 to prevent using cups internal log rotation
   sed -i -e '5i\ ' conf/cupsd.conf.in
@@ -61,7 +61,7 @@
 }
 
 build() {
-  cd ${pkgbase}-${pkgver}
+  cd "${pkgbase}"-${pkgver}
 
   # use fixed cups user (id 209) since systemd adds "lp" group without a fixed id
   ./configure --prefix=/usr \
@@ -88,7 +88,7 @@
 }
 
 check() {
-  cd ${pkgbase}-${pkgver}
+  cd "${pkgbase}"-${pkgver}
   #make -k check || /bin/true
 }
 
@@ -97,10 +97,10 @@
 depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb')
 
   cd ${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-headers install-libs
+  make BUILDROOT="${pkgdir}" install-headers install-libs
   # put this into the libs pkg to make other software find the libs(no pkg-config file included)
-  mkdir -p ${pkgdir}/usr/bin
-  install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
+  mkdir -p "${pkgdir}"/usr/bin
+  install -m755 "${srcdir}"/"${pkgbase}"-${pkgver}/cups-config "${pkgdir}"/usr/bin/cups-config
 
   # add license + exception
   install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" {LICENSE,NOTICE}
@@ -122,55 +122,55 @@
 optdepends=('xdg-utils: xdg .desktop file support'
             'colord: for ICC color profile support')
 
-  cd ${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-data install-exec
+  cd "${pkgbase}"-${pkgver}
+  make BUILDROOT="${pkgdir}" install-data install-exec
 
   # this one we ship in the libcups pkg
-  rm -f ${pkgdir}/usr/bin/cups-config
+  rm -f "${pkgdir}"/usr/bin/cups-config
 
   # kill the sysv stuff
-  rm -rf ${pkgdir}/etc/rc*.d
-  rm -rf ${pkgdir}/etc/init.d
-  install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
-  install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
+  rm -rf "${pkgdir}"/etc/rc*.d
+  rm -rf "${pkgdir}"/etc/init.d
+  install -D -m644 ../cups.logrotate "${pkgdir}"/etc/logrotate.d/cups
+  install -D -m644 ../cups.pam "${pkgdir}"/etc/pam.d/cups
 
   # fix perms on /var/spool and /etc
-  chmod 755 ${pkgdir}/var/spool
-  chmod 755 ${pkgdir}/etc
+  chmod 755 "${pkgdir}"/var/spool
+  chmod 755 "${pkgdir}"/etc
 
   # use cups group FS#36769
   install -Dm644 "$srcdir"/cups.sysusers "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
-  sed -i "s:#User 209:User 209:" ${pkgdir}/etc/cups/cups-files.conf{,.default}
-  sed -i "s:#Group 209:Group 209:" ${pkgdir}/etc/cups/cups-files.conf{,.default}
+  sed -i "s:#User 209:User 209:" "${pkgdir}"/etc/cups/cups-files.conf{,.default}
+  sed -i "s:#Group 209:Group 209:" "${pkgdir}"/etc/cups/cups-files.conf{,.default}
 
   # install ssl directory where to store the certs, solves some samba issues
-  install -dm700 -g 209 ${pkgdir}/etc/cups/ssl
+  install -dm700 -g 209 "${pkgdir}"/etc/cups/ssl
   # remove directory from package, it will be recreated at each server start
-  rm -rf ${pkgdir}/run
+  rm -rf "${pkgdir}"/run
 
   # install some more configuration files that will get filled by cupsd
-  touch ${pkgdir}/etc/cups/printers.conf
-  touch ${pkgdir}/etc/cups/classes.conf
-  touch ${pkgdir}/etc/cups/subscriptions.conf
-  chgrp -R 209 ${pkgdir}/etc/cups
+  touch "${pkgdir}"/etc/cups/printers.conf
+  touch "${pkgdir}"/etc/cups/classes.conf
+  touch "${pkgdir}"/etc/cups/subscriptions.conf
+  chgrp -R 209 "${pkgdir}"/etc/cups
 
   # fix dbus policy location - --with-dbusdir doens't work
-  install -dm755 ${pkgdir}/usr/share/dbus-1/system.d
-  mv ${pkgdir}/etc/dbus-1/system.d/cups.conf ${pkgdir}/usr/share/dbus-1/system.d
-  rm -rf ${pkgdir}/etc/dbus-1
+  install -dm755 "${pkgdir}"/usr/share/dbus-1/system.d
+  mv "${pkgdir}"/etc/dbus-1/system.d/cups.conf "${pkgdir}"/usr/share/dbus-1/system.d
+  rm -rf "${pkgdir}"/etc/dbus-1
 
   # fix .desktop file
-  sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
+  sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' "${pkgdir}"/usr/share/applications/cups.desktop
 
   # compress some driver files, adopted from Fedora
-  find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
+  find "${pkgdir}"/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
 
   # remove client.conf man page
-  rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
+  rm -f "${pkgdir}"/usr/share/man/man5/client.conf.5
 
   # comment out all conversion rules which use any of the removed filters that are now part of cups-filters
-  perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' $pkgdir/usr/share/cups/mime/mime.convs
+  perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' "$pkgdir"/usr/share/cups/mime/mime.convs
 
   # comment out unnecessary PageLogFormat entry
-  sed -i -e 's:PageLogFormat:#PageLogFormat:' $pkgdir/etc/cups/cupsd.conf*
+  sed -i -e 's:PageLogFormat:#PageLogFormat:' "$pkgdir"/etc/cups/cupsd.conf*
 }


More information about the arch-commits mailing list