* print script name and parameters when debugging. (mh)

svn path=/exim/trunk/; revision=997

15 files changed, 58 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index df71039..3ac7e6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,8 +58,9 @@ exim4 (4.50-4.0) UNRELEASED; urgency=low
   * re-work ue4.conf man page, also addressing #289959. (mh)
   * add a comment about caseless postmaster to
     conf.d/router/400_exim4-config_system_aliases. (mh)
+  * print script name and parameters when debugging. (mh)
 
- -- Marc Haber <mh+debian-packages@zugschlus.de>  Sat,  2 Apr 2005 14:22:43 +0000
+ -- Marc Haber <mh+debian-packages@zugschlus.de>  Sat,  2 Apr 2005 14:27:42 +0000
 
 exim4 (4.50-4) unstable; urgency=low
 
diff --git a/debian/create-custom-package b/debian/create-custom-package
index 2e53e32..b172341 100755
--- a/debian/create-custom-package
+++ b/debian/create-custom-package
@@ -2,7 +2,10 @@
 
 set -e
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 dh_testdir
 if [ -z `which grep-dctrl` ] || ! [ -x `which grep-dctrl` ]; then
diff --git a/debian/exim-gencert b/debian/exim-gencert
index e0a20ab..22749a5 100644
--- a/debian/exim-gencert
+++ b/debian/exim-gencert
@@ -1,6 +1,9 @@
 #!/bin/sh -e
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 DIR=/etc/exim4
 CERT=$DIR/exim.crt
diff --git a/debian/exim4-base.config b/debian/exim4-base.config
index 0f9b9b6..77801cb 100644
--- a/debian/exim4-base.config
+++ b/debian/exim4-base.config
@@ -3,7 +3,10 @@ set -e
 
 . /usr/share/debconf/confmodule
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 if [ -d /var/spool/exim/input ] ; then
 	# With "head -n 1" this shouldn't be expensive.
diff --git a/debian/exim4-base.cron.daily b/debian/exim4-base.cron.daily
index 37b0547..eee236d 100644
--- a/debian/exim4-base.cron.daily
+++ b/debian/exim4-base.cron.daily
@@ -1,6 +1,9 @@
 #!/bin/sh
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 # Only do anything if exim4 is actually installed
 if [ ! -x /usr/lib/exim4/exim4 ]; then
diff --git a/debian/exim4-base.init b/debian/exim4-base.init
index 64cf7ed..a532793 100644
--- a/debian/exim4-base.init
+++ b/debian/exim4-base.init
@@ -8,7 +8,10 @@
 
 set -e
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 #read default file
 QUEUERUNNER='combined'
diff --git a/debian/exim4-base.postinst b/debian/exim4-base.postinst
index c96ea7d..b03acf4 100644
--- a/debian/exim4-base.postinst
+++ b/debian/exim4-base.postinst
@@ -3,8 +3,10 @@
 set -e
 . /usr/share/debconf/confmodule
 
-[ -n "$EX4DEBUG" ] && set -x
-
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 db_version 2.0
 
diff --git a/debian/exim4-base.postrm b/debian/exim4-base.postrm
index 94ea22d..2ff7130 100644
--- a/debian/exim4-base.postrm
+++ b/debian/exim4-base.postrm
@@ -4,7 +4,10 @@ set -e
 
 . /usr/share/debconf/confmodule
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 case "$1" in
     remove)
diff --git a/debian/exim4-config.config b/debian/exim4-config.config
index b362dd9..647e6eb 100644
--- a/debian/exim4-config.config
+++ b/debian/exim4-config.config
@@ -13,7 +13,10 @@ fi
 
 . /usr/share/debconf/confmodule
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 UE4CC="/etc/exim4/update-exim4.conf.conf"
 
diff --git a/debian/exim4-config.postinst b/debian/exim4-config.postinst
index be706f9..c7ad903 100644
--- a/debian/exim4-config.postinst
+++ b/debian/exim4-config.postinst
@@ -4,7 +4,10 @@ set -e
 export exim4postinstisrunning=true
 . /usr/share/debconf/confmodule
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 UE4CC="/etc/exim4/update-exim4.conf.conf"
 
diff --git a/debian/exim4-config.postrm b/debian/exim4-config.postrm
index a5630a7..ad3ad96 100644
--- a/debian/exim4-config.postrm
+++ b/debian/exim4-config.postrm
@@ -3,7 +3,10 @@
 set -e
 . /usr/share/debconf/confmodule
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 case "$1" in
     purge)
diff --git a/debian/exim4-daemon-light.postinst b/debian/exim4-daemon-light.postinst
index f2c5e9d..75f8c39 100644
--- a/debian/exim4-daemon-light.postinst
+++ b/debian/exim4-daemon-light.postinst
@@ -4,7 +4,10 @@ set -e
 
 . /usr/share/debconf/confmodule
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 case "$1" in
 	configure)
diff --git a/debian/exim4-daemon-light.prerm b/debian/exim4-daemon-light.prerm
index c4dc9f7..2973bb2 100644
--- a/debian/exim4-daemon-light.prerm
+++ b/debian/exim4-daemon-light.prerm
@@ -2,7 +2,10 @@
 
 set -e
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 case "$1" in
 	remove|upgrade)
diff --git a/debian/ip-up.d b/debian/ip-up.d
index 4ad65a9..0a63c45 100644
--- a/debian/ip-up.d
+++ b/debian/ip-up.d
@@ -1,6 +1,9 @@
 #!/bin/sh
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 [ -x /usr/lib/exim4/exim4 ] || exit 0
 
diff --git a/debian/update-exim4defaults b/debian/update-exim4defaults
index a0a1c07..4924e0d 100644
--- a/debian/update-exim4defaults
+++ b/debian/update-exim4defaults
@@ -2,7 +2,10 @@
 # update-exim4defaults(8): manage entries in /etc/default/exim4
 # per script
 
-[ -n "$EX4DEBUG" ] && set -x
+if [ -n "$EX4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
 
 defaultfile=/etc/default/exim4