[Pkg-doc-linux-devel] r196 - trunk/doc-linux/debian

[Frank Lichtenheld]

Author: djpig
Date: 2005-10-12 10:12:55 +0000 (Wed, 12 Oct 2005)
New Revision: 196

Modified:
   trunk/doc-linux/debian/doc-linux-html.preinst
   trunk/doc-linux/debian/doc-linux-html.prerm
   trunk/doc-linux/debian/doc-linux-text.preinst
   trunk/doc-linux/debian/doc-linux.changelog
Log:
Fix some possible bashisms


Modified: trunk/doc-linux/debian/doc-linux-html.preinst
===================================================================
--- trunk/doc-linux/debian/doc-linux-html.preinst	2005-10-12 10:04:44 UTC (rev 195)
+++ trunk/doc-linux/debian/doc-linux-html.preinst	2005-10-12 10:12:55 UTC (rev 196)
@@ -1,7 +1,9 @@
-#! /bin/sh -e
+#! /bin/sh
 
-if [ -d /usr/doc/doc-linux-html -a ! -h /usr/doc/doc-linux-html \
-     -a -f /usr/doc/doc-linux-html/.dhelp ]; then
+set -e
+
+if [ -d /usr/doc/doc-linux-html ] && [ ! -h /usr/doc/doc-linux-html ] \
+     && [ -f /usr/doc/doc-linux-html/.dhelp ]; then
     rm -f /usr/doc/doc-linux-html/.dhelp
     rmdir /usr/doc/doc-linux-html
 fi

Modified: trunk/doc-linux/debian/doc-linux-html.prerm
===================================================================
--- trunk/doc-linux/debian/doc-linux-html.prerm	2005-10-12 10:04:44 UTC (rev 195)
+++ trunk/doc-linux/debian/doc-linux-html.prerm	2005-10-12 10:12:55 UTC (rev 196)
@@ -2,7 +2,7 @@
 
 #DEBHELPER#
 
-if [ "$1" = remove -o "$1" = upgrade ] && [ -x /usr/sbin/dhelp_parse ]; then
+if [ "$1" = remove ] || [ "$1" = upgrade ] && [ -x /usr/sbin/dhelp_parse ]; then
 	/usr/sbin/dhelp_parse -d /usr/share/doc/HOWTO/en-html
 fi
 

Modified: trunk/doc-linux/debian/doc-linux-text.preinst
===================================================================
--- trunk/doc-linux/debian/doc-linux-text.preinst	2005-10-12 10:04:44 UTC (rev 195)
+++ trunk/doc-linux/debian/doc-linux-text.preinst	2005-10-12 10:12:55 UTC (rev 196)
@@ -1,7 +1,9 @@
-#! /bin/sh -e
+#! /bin/sh
 
-if [ -d /usr/doc/doc-linux-text -a ! -h /usr/doc/doc-linux-text \
-     -a -f /usr/doc/doc-linux-text/.dhelp ]; then
+set -e
+
+if [ -d /usr/doc/doc-linux-text ] && [ ! -h /usr/doc/doc-linux-text ] \
+     && [ -f /usr/doc/doc-linux-text/.dhelp ]; then
     rm -f /usr/doc/doc-linux-text/.dhelp
     rmdir /usr/doc/doc-linux-text
 fi

Modified: trunk/doc-linux/debian/doc-linux.changelog
===================================================================
--- trunk/doc-linux/debian/doc-linux.changelog	2005-10-12 10:04:44 UTC (rev 195)
+++ trunk/doc-linux/debian/doc-linux.changelog	2005-10-12 10:12:55 UTC (rev 196)
@@ -11,6 +11,7 @@
     Infrared-HOWTO and the MMBase-Inst-HOWTO
   * Fixes suggested by Lintian:
     + Update FSF address in the various licenses
+    + Fix some possible bashisms in the maintainer scripts
 
  -- Frank Lichtenheld <djpig at debian.org>  Wed, 12 Oct 2005 11:45:56 +0200