r533: * In script fragments, use more posix tests, no -a or -o, no parens.

     Closes: #150403

diff --git a/autoscripts/postinst-doc b/autoscripts/postinst-doc
index a4b000baea225672cc93bc7f1a3660d680e1f4e4..a49f4ca4fa6e68b29e7b093f8edc6f5f526a8dd5 100644 (file)
--- a/autoscripts/postinst-doc
+++ b/autoscripts/postinst-doc
@@ -1,5 +1,5 @@
 if [ "$1" = "configure" ]; then
-       if [ -d /usr/doc -a ! -e /usr/doc/#PACKAGE# -a -d /usr/share/doc/#PACKAGE# ]; then
+       if [ -d /usr/doc ] && [ ! -e /usr/doc/#PACKAGE# ] && [ -d /usr/share/doc/#PACKAGE# ]; then
                ln -sf ../share/doc/#PACKAGE# /usr/doc/#PACKAGE#
        fi
 fi

diff --git a/autoscripts/postinst-emacsen b/autoscripts/postinst-emacsen
index 97004eb7e2290a43840ed303fce658c0d71ee0a4..f80e1dbd9c8dbc1b5b304f63aedf4d576e0ca57b 100644 (file)
--- a/autoscripts/postinst-emacsen
+++ b/autoscripts/postinst-emacsen
@@ -1,4 +1,4 @@
-if [ "$1" = "configure" -a -x /usr/lib/emacsen-common/emacs-package-install ]
+if [ "$1" = "configure" ] && [ -x /usr/lib/emacsen-common/emacs-package-install ]
 then
        /usr/lib/emacsen-common/emacs-package-install #PACKAGE#
 fi

diff --git a/autoscripts/postinst-menu b/autoscripts/postinst-menu
index 8a46311ff56369c410df9689b3cc5ff9147cbd90..276a3c0a7f64f4e9bb1bdc83bda0d55faa15f2ba 100644 (file)
--- a/autoscripts/postinst-menu
+++ b/autoscripts/postinst-menu
@@ -1 +1 @@
-if [ "$1" = "configure" -a -x /usr/bin/update-menus ]; then update-menus ; fi
+if [ "$1" = "configure" ] && [ -x /usr/bin/update-menus ]; then update-menus ; fi

diff --git a/autoscripts/postinst-menu-method b/autoscripts/postinst-menu-method
index 0ea7959b1a93b5d8b8cbe1bd9d5e2d2d3bc4f0f7..01913d8269354b56a66e6c86db3c7264736b5c61 100644 (file)
--- a/autoscripts/postinst-menu-method
+++ b/autoscripts/postinst-menu-method
@@ -1,5 +1,5 @@
 inst=/etc/menu-methods/#PACKAGE#
-if [ -x /usr/bin/update-menus -a -f $inst -a -x /usr/sbin/install-menu ] ; then
+if [ -x /usr/bin/update-menus ] && [ -f $inst ] ; then
        chmod a+x $inst
        update-menus
 fi

diff --git a/autoscripts/postinst-mime b/autoscripts/postinst-mime
index a28e5bd7911efc26bf1dfaa25c609c2c017f829b..bef63cc97295085f3db20ba68bc07f60e11b71ab 100644 (file)
--- a/autoscripts/postinst-mime
+++ b/autoscripts/postinst-mime
@@ -1 +1 @@
-if [ "$1" = "configure" -a -x /usr/sbin/update-mime ]; then update-mime; fi
+if [ "$1" = "configure" ] && [ -x /usr/sbin/update-mime ]; then update-mime; fi

diff --git a/autoscripts/postinst-modules b/autoscripts/postinst-modules
index b25a1c1301ad25301aa11b367074c5dbdcad4cac..bcd7c34b32d24611282d1b3e7e7870db8d4d6dfb 100644 (file)
--- a/autoscripts/postinst-modules
+++ b/autoscripts/postinst-modules
@@ -1,3 +1,3 @@
-if [ "$1" = "configure" -a -x /sbin/update-modules ]; then
+if [ "$1" = "configure" ] && [ -x /sbin/update-modules ]; then
        update-modules
 fi

diff --git a/autoscripts/postrm-debconf b/autoscripts/postrm-debconf
index a0a63b313e54af2f1ba793b584f27534f645e993..5a61724d3b2c257b36fd5a0558223d388e378434 100644 (file)
--- a/autoscripts/postrm-debconf
+++ b/autoscripts/postrm-debconf
@@ -1,4 +1,4 @@
-if [ "$1" = purge -a -e /usr/share/debconf/confmodule ]; then
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
        . /usr/share/debconf/confmodule
        db_purge
 fi

diff --git a/autoscripts/postrm-menu-method b/autoscripts/postrm-menu-method
index 0d573fd0d16bba693ab66b058dbcadf0593ba7b4..ffa1e4862bd35a3cf125f351d701f28033e4dff8 100644 (file)
--- a/autoscripts/postrm-menu-method
+++ b/autoscripts/postrm-menu-method
@@ -1,3 +1,3 @@
 inst=/etc/menu-methods/#PACKAGE#
-if [ "$1" = "remove" -a -f "$inst" ]; then chmod a-x $inst ; fi
+if [ "$1" = "remove" ] && [ -f "$inst" ]; then chmod a-x $inst ; fi
 if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi

diff --git a/autoscripts/postrm-suid b/autoscripts/postrm-suid
index 46fee33e16acde715f08d526969e58d9a32e5390..a4cfecf9a943b25d7d1c6a9810f34863b8b94278 100644 (file)
--- a/autoscripts/postrm-suid
+++ b/autoscripts/postrm-suid
@@ -1,4 +1,4 @@
-if [ "$1" = remove -a -e /etc/suid.conf ] && \
+if [ "$1" = remove ] && [ -e /etc/suid.conf ] && \
    which suidunregister >/dev/null 2>&1; then
         suidunregister -s #PACKAGE# /#FILE#
 fi

diff --git a/autoscripts/postrm-xfonts b/autoscripts/postrm-xfonts
index b5dd964ba996628813073dd84579e29c4107e0b4..a4d0a082465d54730844447fba313fe841ae4cac 100644 (file)
--- a/autoscripts/postrm-xfonts
+++ b/autoscripts/postrm-xfonts
@@ -1,3 +1,3 @@
-if [ "$1" != "upgrade" -a -x /usr/sbin/update-fonts-dir ]; then
+if [ "$1" != "upgrade" ] && [ -x /usr/sbin/update-fonts-dir ]; then
 #CMDS#
 fi

diff --git a/autoscripts/prerm-doc b/autoscripts/prerm-doc
index 5ae92d716bea36729d9072a838c7d3aac73dd49e..05abb49501c6e4fe81ec47cc7aa6a964726ec7f7 100644 (file)
--- a/autoscripts/prerm-doc
+++ b/autoscripts/prerm-doc
@@ -1,3 +1,4 @@
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/#PACKAGE# ]; then
+if [ "$1" = "upgrade" ] || [ "$1" = "remove" ] && [ -L /usr/doc/#PACKAGE#
+then
        rm -f /usr/doc/#PACKAGE#
 fi

diff --git a/autoscripts/prerm-init-norestart b/autoscripts/prerm-init-norestart
index b7e311d3efc39ad23b92bd6286be08482f70fbfa..96fcea441d76cf1da8ca569f15c8cc69706b2739 100644 (file)
--- a/autoscripts/prerm-init-norestart
+++ b/autoscripts/prerm-init-norestart
@@ -1,3 +1,3 @@
-if [ -x "/etc/init.d/#SCRIPT#" -a "$1" = remove ]; then
+if [ -x "/etc/init.d/#SCRIPT#" ] && [ "$1" = remove ]; then
        /etc/init.d/#SCRIPT# stop
 fi

diff --git a/autoscripts/prerm-init-norestart-invoke b/autoscripts/prerm-init-norestart-invoke
index f04d45cfb818fb21fbba6fcb2f611dbfa6f3a28f..b9414f07cc7762454c897203a77f87b03416832e 100644 (file)
--- a/autoscripts/prerm-init-norestart-invoke
+++ b/autoscripts/prerm-init-norestart-invoke
@@ -1,3 +1,3 @@
-if [ -x "/etc/init.d/#SCRIPT#" -a "$1" = remove ]; then
+if [ -x "/etc/init.d/#SCRIPT#" ] && [ "$1" = remove ]; then
        invoke-rc.d #SCRIPT# stop
 fi

diff --git a/debian/changelog b/debian/changelog
index b26894cccbad38c4645b8154cd02da87d55d3524..221eb8cb2ad6b4120d6619ce36bc30f9b4892c2d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (4.0.14) unstable; urgency=low
+
+  * In script fragments, use more posix tests, no -a or -o, no parens.
+    Closes: #150403
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 20 Jun 2002 20:39:55 -0400
+
 debhelper (4.0.13) unstable; urgency=low
 
   * Added --mainpackage= option, of use in some kernel modules packages.