Bug#799483: vdr: Broken commands.conf due to echo -e not understood by dash

[Eric L.]

Package: vdr
Version: 2.2.0-2~etobi3
Severity: normal
Tags: patch

Hi,

/usr/lib/vdr/merge-commands.sh used "echo -e" which isn't understood by dash,
meaning that -e is entered at the beginning of /var/cache/vdr/commands.conf
and the commands are shifted by one.

One could simply replace "echo -e" with "/bin/echo -e" but I thought that
an here-document is more elegant (see attached file).

KR, Eric

-- System Information:
Debian Release: 8.2
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'stable-updates')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.7-ckt7+vdr1 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages vdr depends on:
ii  adduser                3.113+nmu3
ii  debconf [debconf-2.0]  1.5.56
ii  init-system-helpers    1.22
ii  libc6                  2.19-18+deb8u1
ii  libcap2                1:2.24-8
ii  libfontconfig1         2.11.0-6.3
ii  libfreetype6           2.5.2-3
ii  libgcc1                1:4.9.2-10
ii  libjpeg62-turbo        1:1.3.1-12
ii  libstdc++6             4.9.2-10
ii  libsystemd0            215-17+deb8u2

Versions of packages vdr recommends:
ii  fonts-freefont-ttf  20120503-4
ii  lirc                0.9.0~pre1-1.2
ii  ttf-bitstream-vera  1.10-8

Versions of packages vdr suggests:
pn  vdr-plugin-dvbsddevice  <none>

-- Configuration Files:
/etc/default/vdr changed [not included]
/etc/vdr/command-hooks/commands.custom.conf changed [not included]
/etc/vdr/command-hooks/order.commands.conf 6f3fafcaa16c454645c64a98bd064491 [Errno 2] Datei oder Verzeichnis nicht gefunden: u'/etc/vdr/command-hooks/order.commands.conf 6f3fafcaa16c454645c64a98bd064491'
/etc/vdr/command-hooks/order.reccmds.conf 87e4187bd6121964ce054223570caac4 [Errno 2] Datei oder Verzeichnis nicht gefunden: u'/etc/vdr/command-hooks/order.reccmds.conf 87e4187bd6121964ce054223570caac4'
/etc/vdr/conf.d/00-vdr.conf changed [not included]
/etc/vdr/keymacros.conf changed [not included]
/etc/vdr/plugins/order.conf d090a379a6eb172993f751adc14d5b6e [Errno 2] Datei oder Verzeichnis nicht gefunden: u'/etc/vdr/plugins/order.conf d090a379a6eb172993f751adc14d5b6e'
/etc/vdr/vdr.groups changed [not included]

-- debconf information excluded
-------------- next part --------------
#
# This file is called by /etc/init.d/vdr and the by vdr.service
#
# merges single <cmdtype>.<name>.conf files into one <cmdtype>.conf
# in alphabetical order
#

.. /usr/lib/vdr/config-loader.sh

writewarning ()
{
cat > "$2" <<EOW
# 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).

EOW
}

cmdtype=$1
cmdfile="/var/cache/vdr/$cmdtype.conf"

writewarning $cmdtype "$cmdfile"

find $CMDHOOKSDIR -maxdepth 1 -name "$cmdtype.*.conf" | sort | xargs cat >> "$cmdfile"