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

[Guillaume Alaux]

    Date: Saturday, February 15, 2014 @ 15:25:50
  Author: guillaume
Revision: 205999

Set double quotes around pkgdir and srcdir

Modified:
  tomcat6/trunk/PKGBUILD

----------+
 PKGBUILD |   54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-15 14:20:25 UTC (rev 205998)
+++ PKGBUILD	2014-02-15 14:25:50 UTC (rev 205999)
@@ -2,7 +2,7 @@
 pkgname=tomcat6
 pkgver=6.0.39
 pkgrel=1
-pkgdesc='Servlet-2.5/JSP-2.1 Container'
+pkgdesc='Open source software implementation of the Java Servlet and JavaServer Pages technologies'
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
@@ -25,6 +25,7 @@
             'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68'
             '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
             '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
+
 _gid_log=19
 _gid_tomcat6=66
 _uid_tomcat6=66
@@ -33,42 +34,41 @@
   cd "${srcdir}/apache-tomcat-${pkgver}"
 
   # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
+  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
   # commons-daemon and tomcat-natives are packaged on their own
   rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
+  cp -r bin "${pkgdir}"/usr/share/${pkgname}
 
   # eclipse-ecj is packaged on its own
   rm lib/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
+  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
 
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
+  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
 
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
+  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
 
-  install -dm775 -o ${_uid_tomcat6} -g ${_gid_log} ${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
+  install -dm775 -o ${_uid_tomcat6} -g ${_gid_log} "${pkgdir}"/var/log/${pkgname}
+  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
+  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
+  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
 
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat6} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat6} -m775 ${pkgdir}/etc/${pkgname}/Catalina
-  ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
+  install -dm775 "${pkgdir}"/etc/${pkgname}
+  install -g ${_gid_tomcat6} -m640 conf/* "${pkgdir}"/etc/${pkgname}
+  install -d -g ${_gid_tomcat6} -m775 "${pkgdir}"/etc/${pkgname}/Catalina
+  ln -s /etc/${pkgname} "${pkgdir}"/usr/share/${pkgname}/conf
 
-  install -dm775 ${pkgdir}/var/lib/${pkgname}
-  cp -r webapps ${pkgdir}/var/lib/${pkgname}
-  chown -R ${_uid_tomcat6}:${_gid_tomcat6} ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
+  install -dm775 "${pkgdir}"/var/lib/${pkgname}
+  cp -r webapps "${pkgdir}"/var/lib/${pkgname}
+  chown -R ${_uid_tomcat6}:${_gid_tomcat6} "${pkgdir}"/var/lib/${pkgname}
+  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
 
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat6} -g ${_gid_tomcat6} ${pkgdir}/var/tmp/${pkgname}/{temp,work}
-  ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
-  ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
+  install -dm1777 "${pkgdir}"/var/tmp
+  install -dm775 -o ${_uid_tomcat6} -g ${_gid_tomcat6} "${pkgdir}"/var/tmp/${pkgname}/{temp,work}
+  ln -s /var/tmp/${pkgname}/temp "${pkgdir}"/usr/share/${pkgname}/temp
+  ln -s /var/tmp/${pkgname}/work "${pkgdir}"/usr/share/${pkgname}/work
 
-  install -Dm644 ${srcdir}/systemd_tomcat6.service \
-                 ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_tmpfiles.d_tomcat6.conf \
-                 ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
+  install -Dm644 "${srcdir}"/systemd_tomcat6.service \
+                 "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
+  install -Dm644 "${srcdir}"/systemd_tmpfiles.d_tomcat6.conf \
+                 "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
 }
-