add closes

[pkg/blosxom.git] / debian / preinst

diff --git a/debian/preinst b/debian/preinst
index 9052dd1e36eed08c93c530154e2f8b5ce2c07b2c..2635c367e0f89d388c9f65bc2e6bff3956d02f4e 100644 (file)
--- a/debian/preinst
+++ b/debian/preinst
@@ -1,8 +1,10 @@
-#!/bin/sh -e
+#!/bin/sh
 # preinst script for blosxom
-# copyright 2007-2008 by Gerfried Fuchs <rhonda@debian.at>
+# copyright 2007-2008 by Rhonda D'Vine <rhonda@debian.org>
 # Licenced in the same way as blosxom itself
 
+set -e
+
 rm_conffile() {
        PKGNAME="$1"
        CONFFILE="$2"
@@ -32,6 +34,7 @@ install|upgrade)
                        story.1993 story.html story.index ; do
                        rm_conffile blosxom "/etc/blosxom/flavours/$i"
                done
+               rm_conffile blosxom "/etc/blosxom/plugins/timezone"
        fi
        if [ -d /var/lib/blosxom/data/flavours ] ; then
                cd /var/lib/blosxom/data/flavours
@@ -40,7 +43,7 @@ install|upgrade)
                        foot.1993  foot.html  foot.index \
                        head.1993  head.html  head.index \
                        story.1993 story.html story.index ; do
-                       test ! -L $i || test ! -f $i || rm $i
+                       test ! -L $i || test -f $i || rm $i
                done
        fi
 esac