General coding style cleanup for maintainer scripts

Use if instead of case statements and run in more circumstances to
catch unusual error handling cases.

diff --git a/debian/changelog b/debian/changelog
index 0a041bd35af3caafdae41cf5bd5ed4aca3552c24..68e27398f7ef2f749e1b3844a4da02dce27550b3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ openafs (1.6.3-1) UNRELEASED; urgency=low
       AFSDB/SRV records are not being used.
   * Remove openafs-fileserver postinst support for upgrades from ancient
     versions (1.4.4.dfsg1-4 and 1.4.11+dfsg-3).
+  * General coding style cleanup of maintainer scripts.
 
  -- Russ Allbery <rra@debian.org>  Mon, 17 Jun 2013 10:50:14 -0700
 

diff --git a/debian/openafs-client.config b/debian/openafs-client.config
index 539c815887d000c321d42e615755669844f6288e..637960e20881df1addfd023e4ebd36e121eb4ddf 100755 (executable)
--- a/debian/openafs-client.config
+++ b/debian/openafs-client.config
@@ -1,8 +1,8 @@
 #!/bin/sh
+
 set -e
 
 . /usr/share/debconf/confmodule
-
 db_version 2.0
 
 # Configure the client cell.  Default to the current ThisCell file and,

diff --git a/debian/openafs-client.postrm b/debian/openafs-client.postrm
index 789c1eda2ff4ade69a1ee98eff898ead6ec4346c..b24bfd02449aa1f926f612c615cf2979f5bb7f84 100755 (executable)
--- a/debian/openafs-client.postrm
+++ b/debian/openafs-client.postrm
@@ -2,20 +2,13 @@
 
 set -e
 
-case "$1" in
-purge)
+# Remove configuration files and the /afs mount point that are created by the
+# normal postinst action.
+if [ "$1" = 'purge' ] ; then
     rmdir /afs 2>/dev/null || true
     for file in cacheinfo CellServDB ThisCell afs.conf.client ; do
         rm -f "/etc/openafs/$file"
     done
-    ;;
-
-remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-*)
-    echo "postrm called with unknown argument $1" >&2
-    exit 0
-esac
+fi
 
 #DEBHELPER#

diff --git a/debian/openafs-dbserver.postrm b/debian/openafs-dbserver.postrm
index 6107679411b2844e3b5dc5c005513e2adc37dc7a..2c225dd1afca080bfac5161a3c2e3002cc301680 100755 (executable)
--- a/debian/openafs-dbserver.postrm
+++ b/debian/openafs-dbserver.postrm
@@ -1,28 +1,17 @@
 #! /bin/sh
-# postrm script for openafs-dbserver
-#
-# Purges the database and log files created by the package.  We assume that
-# it's safe to do this for database files since they're normally transferred
-# via Ubik to other hosts.
 
 set -e
 
-case "$1" in
-purge)
+# Purges the database and log files created by the package.  We assume that
+# it's safe to do this for database files since they're normally transferred
+# via Ubik to other hosts.
+if [ "$1" = 'purge' ] ; then
     for file in prdb.DB0 prdb.DBSYS1 vldb.DB0 vldb.DBSYS1 ; do
         rm -f "/var/lib/openafs/db/$file"
     done
     for file in PtLog PtLog.old VLLog VLLog.old ; do
         rm -f "/var/log/openafs/$file"
     done
-    ;;
-
-remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-*)
-    echo "postrm called with unknown argument $1" >&2
-    exit 0
-esac
+fi
 
 #DEBHELPER#

diff --git a/debian/openafs-fileserver.config b/debian/openafs-fileserver.config
index 9e221e616eaf2ee2f7f6ff9456fe325c834daee1..59ede70ad850dfd923ee82555454a7d5a4886866 100755 (executable)
--- a/debian/openafs-fileserver.config
+++ b/debian/openafs-fileserver.config
@@ -1,8 +1,8 @@
 #!/bin/sh
+
 set -e
 
 . /usr/share/debconf/confmodule
-
 db_version 2.0
 
 # Warn anyone who's trying to run the file server on alpha.

diff --git a/debian/openafs-fileserver.postinst b/debian/openafs-fileserver.postinst
index c54000b650a151a37136c40dbbf1b27aa9dec022..a893a60c6b851a79bbcea0b83e63f020fcc77461 100755 (executable)
--- a/debian/openafs-fileserver.postinst
+++ b/debian/openafs-fileserver.postinst
@@ -2,35 +2,24 @@
 
 set -e
 
-case "$1" in
-configure)
-    . /usr/share/debconf/confmodule
-    db_version 2.0
-
-    db_get openafs-fileserver/thiscell
-    echo $RET >/etc/openafs/server/ThisCell
-
-    if [ ! -f /etc/openafs/server/CellServDB ] ; then
-        sed -n "/^>$RET/,/^>/p" /etc/openafs/CellServDB | sed '$d' \
-            >/etc/openafs/server/CellServDB
-        if [ ! -s /etc/openafs/server/CellServDB ] ; then
-            echo ">$RET" >/etc/openafs/server/CellServDB
-        fi
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+# Configure the local cell for the file server.
+db_get openafs-fileserver/thiscell
+echo $RET >/etc/openafs/server/ThisCell
+
+# If there is no local server CellServDB, construct it from the client
+# CellServDB by looking for the local cell.  If that fails, create a minimal
+# CellServDB for the server with no information.
+if [ ! -f /etc/openafs/server/CellServDB ] ; then
+    sed -n "/^>$RET/,/^>/p" /etc/openafs/CellServDB | sed '$d' \
+        >/etc/openafs/server/CellServDB
+    if [ ! -s /etc/openafs/server/CellServDB ] ; then
+        echo ">$RET" >/etc/openafs/server/CellServDB
     fi
-    db_stop
-    ;;
-
-abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-*)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 0
-    ;;
-esac
+fi
 
-# dh_installdeb will replace this with shell code automatically generated by
-# other debhelper scripts.
 #DEBHELPER#
 
 exit 0

diff --git a/debian/openafs-fileserver.postrm b/debian/openafs-fileserver.postrm
index b1ede3d9959f5c828b31d79558244128ff6f235e..4d20ea9b7b89af2ad9a7c06c76bb255a3aa38496 100755 (executable)
--- a/debian/openafs-fileserver.postrm
+++ b/debian/openafs-fileserver.postrm
@@ -1,7 +1,8 @@
-#! /bin/sh
-# postrm script for openafs-fileserver
-#
-# Purges various extra configuration files and data files created by the
+#!/bin/sh
+
+set -e
+
+# Purge various extra configuration files and data files created by the
 # package.  Whether to purge KeyFile is a bit iffy since the user created it
 # with asetkey or with bos addkey, but it always exists for any running server
 # and we shouldn't be losing any critical data.
@@ -9,11 +10,7 @@
 # We intentionally don't remove NetInfo and NetRestrict in
 # /var/lib/openafs/local since those are created separately by the user and
 # may contain information not stored elsewhere.
-
-set -e
-
-case "$1" in
-purge)
+if [ "$1" = 'purge' ] ; then
     for file in CellServDB CellServDB.old KeyFile ThisCell UserList ; do
         rm -f "/etc/openafs/server/$file"
     done
@@ -25,14 +22,6 @@ purge)
         rm -f "/var/log/openafs/$file"
         rm -f "/var/log/openafs/$file.old"
     done
-    ;;
-
-remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-*)
-    echo "postrm called with unknown argument \`$1'" >&2
-    exit 0
-esac
+fi
 
 #DEBHELPER#

diff --git a/debian/openafs-fileserver.preinst b/debian/openafs-fileserver.preinst
index 9b6a1d3e31a11f912335fe89b82c662ed5fac13a..92666b96f0aa0eccb3843438726a63c29b115a0b 100755 (executable)
--- a/debian/openafs-fileserver.preinst
+++ b/debian/openafs-fileserver.preinst
@@ -6,6 +6,9 @@ set -e
 # openafs-client.  This was changed in 1.4.12+dfsg-1, but the symlink was
 # never removed, and dpkg won't remove symlinks to a directory.  Belatedly
 # clean up so that we don't overwrite doc files in openafs-client.
+#
+# This cleanup was added in 1.6.2~pre2-1 and can be removed after the jessie
+# release.
 test ! -L /usr/share/doc/openafs-fileserver \
     || rm /usr/share/doc/openafs-fileserver
 

diff --git a/debian/openafs-krb5.postinst b/debian/openafs-krb5.postinst
index 2e480916a702d58142cee346c65da0be49e8882c..32808c57b07b0cb6310763920f05acda834884b9 100755 (executable)
--- a/debian/openafs-krb5.postinst
+++ b/debian/openafs-krb5.postinst
@@ -2,12 +2,10 @@
 
 set -e
 
-if [ "$1" = configure ] || [ "$1" = reconfigure ] ; then
-    update-alternatives --install /usr/bin/klog klog \
-        /usr/bin/klog.krb5 20 \
-        --slave /usr/share/man/man1/klog.1.gz klog.1.gz \
-        /usr/share/man/man1/klog.krb5.1.gz
-fi
+update-alternatives --install /usr/bin/klog klog \
+    /usr/bin/klog.krb5 20 \
+    --slave /usr/share/man/man1/klog.1.gz klog.1.gz \
+    /usr/share/man/man1/klog.krb5.1.gz
 
 #DEBHELPER#