1 files changed, 6 insertions, 6 deletions
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