From 1a0666f61207432bdad49c494c16ccd1d06ba4b9 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 29 Nov 2008 15:16:48 -0600
Subject: Dvico remote is now a special case if detected.

Closes FS#24 pending feedback
---
 abs/core-testing/LinHES-config/PKGBUILD               |  2 +-
 abs/core-testing/LinHES-config/install_functions.sh   | 19 +++++++++++++------
 abs/core-testing/runit-scripts/PKGBUILD               |  2 +-
 .../runit-scripts/runitscripts/services/lircd/run     | 11 +++++++++++
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index aee95bd..e587a03 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=1.0
-pkgrel=27
+pkgrel=31
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
 pkgdesc="Install and configure your system"
 depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan)
diff --git a/abs/core-testing/LinHES-config/install_functions.sh b/abs/core-testing/LinHES-config/install_functions.sh
index e5912da..07bc4fa 100755
--- a/abs/core-testing/LinHES-config/install_functions.sh
+++ b/abs/core-testing/LinHES-config/install_functions.sh
@@ -35,7 +35,7 @@ update_db_settings Theme "$pick"
 
 
 function setupremote {
-    mv -f $BASE/etc/lircd.conf $BASE/etc/lircd.conf.`date +%Y-%m-%d-%H-%M` 2>/dev/null
+    [ -e $BASE/etc/lircd.conf ] && mv -f $BASE/etc/lircd.conf $BASE/etc/lircd.conf.`date +%Y-%m-%d-%H-%M` 
     if [ -d $TEMPLATES/remotes/$Remotetype ]
     then
             cd $TEMPLATES/remotes/$Remotetype
@@ -43,12 +43,19 @@ function setupremote {
             do
                     cat $i >> $BASE/etc/lircd.conf
             done
-            cp -f lircrc* $BASE/etc/lircrc
-            chmod 755 /etc/lircrc
+            cp -f lircrc* $BASE/etc/lircrc 2> /dev/null
+            [ -e /etc/lircrc ] && chmod 755 /etc/lircrc
             update_db_settings HostRemoteType  "$Remotetype"
-            /usr/sbin/lircd  -d /dev/lirc0
-            mkdir /root/.mythtv
-           ln -s /etc/lircrc /root/.mythtv/lircrc
+	    #special case for special remote
+	    echo "Starting with support for $Remotype"
+	    if [ x$Remotetype = "dvico" ]
+	    then
+	            /usr/sbin/lircd  -d /dev/usb/hiddev0 
+	    else
+	            /usr/sbin/lircd  -d /dev/lirc0
+	    fi
+	    [ -e /root/.mythtv ] ||  mkdir /root/.mythtv 2>/dev/null
+            ln -s /etc/lircrc /root/.mythtv/lircrc 2>/dev/null
     fi
 }
 
diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD
index db82360..7d68dd4 100755
--- a/abs/core-testing/runit-scripts/PKGBUILD
+++ b/abs/core-testing/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=1.8.0
-pkgrel=4
+pkgrel=5
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
index 4457b37..57b1b48 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
@@ -2,6 +2,16 @@
 exec 2>&1
 run_lircd2=false
 . /etc/systemconfig
+
+function dvico_detect {
+
+
+  if [ x$Remotetype = "dvico" ]
+  then
+                DEVICE="/dev/usb/hiddev0"
+  fi
+}
+
 function imon_detect {
 if [ -e /dev/lirc_imon ]
 then
@@ -27,6 +37,7 @@ case $ReceiverType in
 
 		DEVICE=`ls  /dev/lirc[0-9] 2>/dev/null |sort |sed '/./,$!d'|head -n 1 `
 		imon_detect
+		dvico_detect
 	;;
 esac
 
-- 
cgit v0.12

