/etc/init.d/lirc broken when both REMOTE and TRANSMITTER are defined

[Jeremy Yoder]

Binary package hint: lirc

The patch is small.. I had to move the renaming of the TRANSMITTER_SOCKET variable into the if block that defines the default value. This is the proper behavior anyway, since if the user has defined a value for TRANSMITTER_SOCKET we shouldn't be touching it.

--- /etc/init.d/lirc 2009-10-17 06:06:53.000000000 -0400
+++ lirc 2009-11-05 12:49:36.700779791 -0500
@@ -80,7 +80,6 @@
                #Now, if we ALSO have a remote defined, add some args
                #To make the second lircd connect
                if [ ! -z "$REMOTE_DEVICE" ] || [ ! -z "$REMOTE_DRIVER" ]; then
- TRANSMITTER_SOCKET="${TRANSMITTER_SOCKET}1"
                        TRANSMITTER_ARGS="$TRANSMITTER_ARGS --connect=localhost:8765 --pidfile=/var/run/lirc/lircd1.pid"
                fi
                TRANSMITTER_ARGS="--output=$TRANSMITTER_SOCKET $TRANSMITTER_ARGS"
@@ -129,6 +128,11 @@
 fi
 if [ -z "$TRANSMITTER_SOCKET" ]; then
        TRANSMITTER_SOCKET="/var/run/lirc/lircd"
+ #Now, if we ALSO have a remote defined,
+ #change the default transmitter socket
+ if [ ! -z "$REMOTE_DEVICE" ] || [ ! -z "$REMOTE_DRIVER" ]; then
+ TRANSMITTER_SOCKET="${TRANSMITTER_SOCKET}1"
+ fi
 fi

 case "$1" in

[MarcRandolph (mrand)]

Jeremy Yoder, could you check upstream and see if this has already been addressed, and if not, submit it? Thanks!

[Jeremy Yoder (jyoder)]

Upstream doesn't provide /etc/init.d/lirc or /etc/lirc/hardware.conf. Those are part of the debianization of the package and live in the debian directory.

I've updated my repository with the changes:
lp:~jyoder/+junk/lirc-CVS

[Ken VanDine (ken-vandine)]

This fix was included in the 0.8.6-0ubuntu4 upload but the bug # wasn't referenced. Makring as fix released.