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

[Guillaume Alaux]

    Date: Saturday, February 15, 2014 @ 15:18:04
  Author: guillaume
Revision: 205997

Used variables for uid and gid in PKGBUILD

Modified:
  tomcat6/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-15 14:11:30 UTC (rev 205996)
+++ PKGBUILD	2014-02-15 14:18:04 UTC (rev 205997)
@@ -25,6 +25,9 @@
             'b6d85501b00032a1385222e80a5f8e357276aaad605e699f40d5cc3770b8ce68'
             '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
             '53ec4e24b3c4eec9d5dd4ac6e84d5758de4f459031d630486812439cce74af21')
+_gid_log=19
+_gid_tomcat6=66
+_uid_tomcat6=66
 
 package() {
   cd "${srcdir}/apache-tomcat-${pkgver}"
@@ -43,24 +46,23 @@
 
   ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
 
-  # 66=tomcat / 19=log
-  install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
+  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 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
+  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
 
   install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g 66 -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g66 -m775 ${pkgdir}/etc/${pkgname}/Catalina
+  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 66:66 ${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 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
+  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