change receiver_usb to be | delimited.

4 files changed, 44 insertions, 40 deletions

diff --git a/abs/core-testing/live-installer/PKGBUILD b/abs/core-testing/live-installer/PKGBUILD
index c9ff10c..f5e0037 100755
--- a/abs/core-testing/live-installer/PKGBUILD
+++ b/abs/core-testing/live-installer/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=live-installer
 pkgver=1.0
-pkgrel=44
+pkgrel=47
 pkgdesc="Install and configure your system"
 depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils)
 arch=('i686')
diff --git a/abs/core-testing/live-installer/checkout_MythVantage.sh b/abs/core-testing/live-installer/checkout_MythVantage.sh
index 8cb75e4..bd43915 100755
--- a/abs/core-testing/live-installer/checkout_MythVantage.sh
+++ b/abs/core-testing/live-installer/checkout_MythVantage.sh
@@ -20,7 +20,11 @@ then
     setup_links
     cd -
 else
+    echo "updating exisiting tree"
+    cd MythVantage-app
     git pull
+    git checkout LinHES
+    cd -
 fi
 
 cd MythVantage-app
diff --git a/abs/core-testing/live-installer/install_functions.sh b/abs/core-testing/live-installer/install_functions.sh
index 0c43c97..f6ae6f9 100755
--- a/abs/core-testing/live-installer/install_functions.sh
+++ b/abs/core-testing/live-installer/install_functions.sh
@@ -35,7 +35,7 @@ update_db_settings Theme "$pick"
 
 
 function setupremote {
-    mv $BASE/etc/lircd.conf $BASE/etc/lircd.conf.`date +%Y-%m-%d-%H-%M`
+    mv -f $BASE/etc/lircd.conf $BASE/etc/lircd.conf.`date +%Y-%m-%d-%H-%M` 2>/dev/null
     if [ -d $TEMPLATES/remotes/$Remotetype ]
     then
             cd $TEMPLATES/remotes/$Remotetype
@@ -43,12 +43,12 @@ function setupremote {
             do
                     cat $i >> $BASE/etc/lircd.conf
             done
-            cp lircrc $BASE/etc/lircrc
+            cp -f lircrc* $BASE/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
+            mkdir /root/.mythtv
+           ln -s /etc/lircrc /root/.mythtv/lircrc
     fi
 }
 
@@ -56,11 +56,11 @@ function scan_for_usb_remote () {
 echo "Scanning for usb receiver/remote"
 while read line
 do
-    USBID=`echo "$line"|cut -f1`
+    USBID=`echo "$line"|cut -d"|"  -f1`
     lsusb -d "$USBID" > /dev/null 2>/dev/null
     if [ $? = 0 ]
     then
-        Remotetype=`echo "$line"|cut -f2`
+        Remotetype=`echo "$line"|cut -d"|" -f2`
         echo "found $Remotetype"
         setupremote
         break
diff --git a/abs/core-testing/live-installer/templates/remotes/receiver_usb.id b/abs/core-testing/live-installer/templates/remotes/receiver_usb.id
index ec168ca..bea16cf 100644
--- a/abs/core-testing/live-installer/templates/remotes/receiver_usb.id
+++ b/abs/core-testing/live-installer/templates/remotes/receiver_usb.id
@@ -1,33 +1,33 @@
-0bc7:0005	snapstream_firefly    "X10 Wireless Technology, Inc."
-0bc7:0008   SnapStream_Firefly    "SnapStream Firefly"
-10c4:0003   CommandIR_Tranceiver     " CommandIR Transceiver"
-0bc7:0004   ATI_Remote_Wonder    " ATI Remote Wonder"
-0e9c:0000   StreamZap    "Streamzap Remote"
-0fe9:9010   Dvico   "DVICO Remote:"
-6253:0100   Twinhan_USB  "the VisionPlus is a Twinhan clone "
-1509:9242   MCEUSB-new  "FIC eHome Infrared Transceiver 1509/9242"
-1934:0602   MCEUSB-new  "Fintek eHome Infrared Transceiver 1934/0602"
-147a:e015   MCEUSB-new  "Formosa eHome Infrared Transceiver 147a/e015"
-147a:e017   MCEUSB-new  "Formosa aim / Trust MCE Infrared Receiver147a/e017"
-147a:e018   MCEUSB-new  "Formosa Industrial Computing 147a/e018"
-107b:3009   MCEUSB-new  "Gateway eHome Infrared Transceiver 107b/3009"
-195d:7002   MCEUSB-new  "Itron ione Libra Q-11 195d/7002"
-043e:9803   MCEUSB-new  "LG eHome Infrared Transceiver 043e/9803"
-045e:00a0   MCEUSB-new  "Microsoft MCE Infrared Transceiver 045e/00a0"
-03ee:2501   MCEUSB-new  "Mitsumi 03ee/2501"
-0471:060c   MCEUSB-new  "Philips Infrared Transciever - HP branded 0471/060C"
-0471:060d   MCEUSB-new  "Philips SRM5100 0471/060d"
-0471:0815   MCEUSB-new  "Philips eHome Infrared Transciever 0471/0815"
-2304:0225   MCEUSB-new  "Pinnacle Systems, Inc. 2304/0225"
-179d:0010   MCEUSB-new  "Ricavision internal Infrared Transceiver 179d/0010"
-1308:c001   MCEUSB-new  "Shuttle eHome Infrared Transceiver 1308/c001"
-051c:c001   MCEUSB-new  "Shuttle2 eHome Infrared Transceiver 051c/c001"
-0609:031d   MCEUSB-new  "SMK/Toshiba G83C0004D410 0609/031d"
-0609:0322   MCEUSB-new  "SMK eHome Infrared Transceiver (Sony VAIO)0609/0322"
-0609:0334   MCEUSB-new  "SKM bundled with Hauppauge PVR-150 0609/0334"
-1460:9150   MCEUSB-new  "Tatung eHome Infrared Transceiver 1460/9150"
-1784:0001   MCEUSB-new  "Topseed eHome Infrared Transceiver 1784/0001"
-1784:0006   MCEUSB-new  "Topseed HP eHome Infrared Transceiver 1784/0006"
-1784:0007   MCEUSB-new  "Topseed HP eHome Infrared Transceiver 1784/0007"
-1784:0008   MCEUSB-new  "Topseed eHome Infrared Transceiver 1784/0008"
-045e:006d   MCEUSB-old  "USB Microsoft IR Transceiver Driver 045e/006d"
+0bc7:0005|snapstream_firefly|    "X10 Wireless Technology, Inc."
+0bc7:0008|SnapStream_Firefly|    "SnapStream Firefly"
+10c4:0003|CommandIR_Tranceiver|     " CommandIR Transceiver"
+0bc7:0004|ATI_Remote_Wonder|    " ATI Remote Wonder"
+0e9c:0000|StreamZap|    "Streamzap Remote"
+0fe9:9010|Dvico|   "DVICO Remote:"
+6253:0100|Twinhan_USB|  "the VisionPlus is a Twinhan clone "
+1509:9242|MCEUSB-new|  "FIC eHome Infrared Transceiver 1509/9242"
+1934:0602|MCEUSB-new|  "Fintek eHome Infrared Transceiver 1934/0602"
+147a:e015|MCEUSB-new|  "Formosa eHome Infrared Transceiver 147a/e015"
+147a:e017|MCEUSB-new|  "Formosa aim / Trust MCE Infrared Receiver147a/e017"
+147a:e018|MCEUSB-new|  "Formosa Industrial Computing 147a/e018"
+107b:3009|MCEUSB-new|  "Gateway eHome Infrared Transceiver 107b/3009"
+195d:7002|MCEUSB-new|  "Itron ione Libra Q-11 195d/7002"
+043e:9803|MCEUSB-new|  "LG eHome Infrared Transceiver 043e/9803"
+045e:00a0|MCEUSB-new|  "Microsoft MCE Infrared Transceiver 045e/00a0"
+03ee:2501|MCEUSB-new|  "Mitsumi 03ee/2501"
+0471:060c|MCEUSB-new|  "Philips Infrared Transciever - HP branded 0471/060C"
+0471:060d|MCEUSB-new|  "Philips SRM5100 0471/060d"
+0471:0815|MCEUSB-new|  "Philips eHome Infrared Transciever 0471/0815"
+2304:0225|MCEUSB-new| "Pinnacle Systems, Inc. 2304/0225"
+179d:0010|MCEUSB-new|  "Ricavision internal Infrared Transceiver 179d/0010"
+1308:c001|MCEUSB-new|  "Shuttle eHome Infrared Transceiver 1308/c001"
+051c:c001|MCEUSB-new|  "Shuttle2 eHome Infrared Transceiver 051c/c001"
+0609:031d|MCEUSB-new|  "SMK/Toshiba G83C0004D410 0609/031d"
+0609:0322|MCEUSB-new|  "SMK eHome Infrared Transceiver (Sony VAIO)0609/0322"
+0609:0334|MCEUSB-new|  "SKM bundled with Hauppauge PVR-150 0609/0334"
+1460:9150|MCEUSB-new|  "Tatung eHome Infrared Transceiver 1460/9150"
+1784:0001|MCEUSB-new|  "Topseed eHome Infrared Transceiver 1784/0001"
+1784:0006|MCEUSB-new|  "Topseed HP eHome Infrared Transceiver 1784/0006"
+1784:0007|MCEUSB-new|  "Topseed HP eHome Infrared Transceiver 1784/0007"
+1784:0008|MCEUSB-new|  "Topseed eHome Infrared Transceiver 1784/0008"
+045e:006d|MCEUSB-old|  "USB Microsoft IR Transceiver Driver 045e/006d"