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

[Guillaume Alaux]

    Date: Saturday, February 15, 2014 @ 15:41:48
  Author: guillaume
Revision: 206002

Reconciliated PKGBUILD with tomcat8 (1/2)

Modified:
  tomcat6/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-15 14:29:32 UTC (rev 206001)
+++ PKGBUILD	2014-02-15 14:41:48 UTC (rev 206002)
@@ -35,18 +35,19 @@
 
   # Tomcat general files
   install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
+  cp -r bin "${pkgdir}"/usr/share/${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}
+  rm "${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
+  ln -s /usr/share/java/commons-daemon.jar "${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
 
+  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
   # eclipse-ecj is packaged on its own
-  rm lib/ecj-*.jar
+  rm "${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}
-
   ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
 
+  # We log through systemd but this would still be required for stock Tomcat logging
   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}