[vdr] 05/06: Removed bashism from merge-commands.conf (Closes: #799483)

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to annotated tag debian/2.2.0-2_etobi4
in repository vdr.

commit b524765a996bec500290a5a8d9b8067c8c59f6e3
Author: etobi <git at e-tobi.net>
Date:   Sun Sep 20 20:56:25 2015 +0200

    Removed bashism from merge-commands.conf (Closes: #799483)
---
 debian/changelog         |  1 +
 debian/merge-commands.sh | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1547add..925f9ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ vdr (2.2.0-1) unstable; urgency=medium
   * Added systemd support
   * Removed ENABLED setting from /etc/default/vdr - the vdr daemon is now
     enabled by default and might be disabled manuall via update-rc.d / systemctl
+  * Removed bashism from merge-commands.conf (Closes: #799483)
 
  -- Tobias Grimm <etobi at debian.org>  Tue, 15 Sep 2015 23:53:12 +0200
 
diff --git a/debian/merge-commands.sh b/debian/merge-commands.sh
index 2746b3d..7b47011 100644
--- a/debian/merge-commands.sh
+++ b/debian/merge-commands.sh
@@ -9,17 +9,17 @@
 
 writewarning ()
 {
-echo -e \
-"#\n"\
-"# This file is automatically generated by the vdr init-script. You can\n"\
-"# define custom commands in /etc/vdr/command-hooks/$1.custom.conf\n"\
-"# (see /usr/share/doc/vdr/README.Debian.gz).\n"\
-"#\n\n\n"
+cat > "$2" <<EOF
+# This file is automatically generated by the vdr init-script. You can
+# define custom commands in /etc/vdr/command-hooks/$1.custom.conf
+# (see /usr/share/doc/vdr/README.Debian.gz).
+
+EOF
 }
 
 cmdtype=$1
 cmdfile="/var/cache/vdr/$cmdtype.conf"
 
-writewarning $cmdtype > "$cmdfile"
+writewarning $cmdtype "$cmdfile"
 
 find $CMDHOOKSDIR -maxdepth 1 -name "$cmdtype.*.conf" | sort | xargs cat >> "$cmdfile"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git