[pkg-java] r9630 - trunk/tomcat6/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-08-05 00:43:01 +0000 (Wed, 05 Aug 2009)
New Revision: 9630

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6.postrm
Log:
postrm removes the extra directories created in /var/lib/tomcat6
to hold shared and common classes or jars.

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2009-08-05 00:06:16 UTC (rev 9629)
+++ trunk/tomcat6/debian/changelog	2009-08-05 00:43:01 UTC (rev 9630)
@@ -2,6 +2,8 @@
 
   * Update checksum in postrm script to reflect changes
     in the new upstream webapp
+  * postrm removes the extra directories created in /var/lib/tomcat6
+    to hold shared and common classes or jars.
 
  -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 05 Aug 2009 00:56:59 +0100
 

Modified: trunk/tomcat6/debian/tomcat6.postrm
===================================================================
--- trunk/tomcat6/debian/tomcat6.postrm	2009-08-05 00:06:16 UTC (rev 9629)
+++ trunk/tomcat6/debian/tomcat6.postrm	2009-08-05 00:43:01 UTC (rev 9630)
@@ -11,14 +11,29 @@
         RWLOC="/var/lib/tomcat6/webapps/ROOT"
         RWFILES="$RWLOC/index.html $RWLOC/META-INF/context.xml"
         if [ "`(cat $RWFILES | md5sum -) 2>/dev/null | cut -d ' ' -f 1`" \
-	    = "c05987dd6c6bcbd651889e9a0ec98ade" ] ; then
-	    rm $RWFILES
-	    rmdir --ignore-fail-on-non-empty \
+                            = "c05987dd6c6bcbd651889e9a0ec98ade" ] ; then
+            rm $RWFILES
+            rmdir --ignore-fail-on-non-empty \
                 /var/lib/tomcat6/webapps/ROOT/META-INF \
                 /var/lib/tomcat6/webapps/ROOT \
                 /var/lib/tomcat6/webapps \
                 /var/lib/tomcat6 || true
         fi
+        if [ -z "`(find var/lib/tomcat6/common/classes -type f)`" ] ; then
+            rmdir --ignore-fail-on-non-empty \
+                /var/lib/tomcat6/common/classes \
+                /var/lib/tomcat6/common || true
+        fi
+        if [ -z "`(find var/lib/tomcat6/server/classes -type f)`" ] ; then
+            rmdir --ignore-fail-on-non-empty \
+                /var/lib/tomcat6/server/classes \
+                /var/lib/tomcat6/server || true
+        fi
+        if [ -z "`(find var/lib/tomcat6/shared/classes -type f)`" ] ; then
+            rmdir --ignore-fail-on-non-empty \
+                /var/lib/tomcat6/shared/classes \
+                /var/lib/tomcat6/shared || true
+        fi
         if [ -d "/var/cache/tomcat6" ] ; then
             rm -rf /var/cache/tomcat6
         fi