LinHES-config: install work

- for upgrades the network must be started.
- white space
- mv_install fix upgrades. upgrades complete but still need a migration process for the new dir structure.

1 files changed, 36 insertions, 59 deletions

diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py
index 36f7545..b38c84e 100755
--- a/abs/core/LinHES-config/mv_ir.py
+++ b/abs/core/LinHES-config/mv_ir.py
@@ -80,12 +80,12 @@ def include_file( incfile,filename):
     f.write("\n")
     f.close()
 
-def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType):
+def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket):
     logging.debug("    Setup of remote type %s",Remotetype)
     if Remotetype == "no_remote" and HostBlasterType == "None" :
         mv_common.remove_service("remotes")
     elif Remotetype == "tinker":
-        pass
+        pass #do nothing
     else:
         currenttime = strftime("%b-%d-%Y-%H:%M:%S", localtime())
         cmd = "mv /etc/lircd.conf /etc/lircd.conf-%s" %currenttime
@@ -94,63 +94,37 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType):
         mv_common.runcmd(cmd)
         cmd = "mv /etc/remote.run /etc/remote.run-%s" %currenttime
         mv_common.runcmd(cmd)
-
-
-        if os.path.isdir(mythhome+"/remotes/"+Remotetype):
-            logging.debug("   Found remote in home dir " )
-            #search home dir
-            files = mythhome + "/remotes/" + Remotetype + "/lircd*"
-            logging.debug("    Using %s",files)
-            for filename in glob.glob(files):
-                # Ignore subfolders
-                if os.path.isdir (filename):
-                    logging.debug("    %s is a dir, skipping",filename)
-                    continue
-                include_file("/etc/lircd.conf",filename)
-            files = mythhome + "/remotes/" + Remotetype + "/lircrc*"
-            logging.debug("    Using %s",files)
-            for filename in glob.glob(files):
-                # Ignore subfolders
-                if os.path.isdir (filename):
-                    logging.debug("    %s is a dir, skipping",filename)
-                    continue
-                include_file("/etc/lircrc",filename)
-            files = mythhome + "/remotes/" + Remotetype + "/remote.run*"
-            logging.debug("    Using %s",files)
-            for filename in glob.glob(files):
-                # Ignore subfolders
-                if os.path.isdir (filename):
-                    logging.debug("    %s is a dir, skipping",filename)
-                    continue
-                cmd = "cp %s /etc/remote.run" %filename
-                mv_common.runcmd(cmd)
+        if remotebucket == "user":
+            remote_path = "%s/remotes/%s"  %(mythhome,Remotetype)
         else:
-            #template dir
-            files = templates + "/remotes/" + Remotetype + "/lircd*"
-            logging.debug("    Using %s",files)
-            for filename in glob.glob(files):
-                # Ignore subfolders
-                if os.path.isdir (filename):
-                    logging.debug("    %s is a dir, skipping",filename)
-                    continue
-                include_file("/etc/lircd.conf",filename)
-            files = templates + "/remotes/" + Remotetype + "/lircrc*"
-            logging.debug("    Using %s",files)
-            for filename in glob.glob(files):
-                # Ignore subfolders
-                if os.path.isdir (filename):
-                    logging.debug("    %s is a dir, skipping",filename)
-                    continue
-                include_file("/etc/lircrc",filename)
-            files = templates + "/remotes/" + Remotetype + "/remote.run*"
-            logging.debug("    Using %s",files)
-            for filename in glob.glob(files):
-                # Ignore subfolders
-                if os.path.isdir (filename):
-                    logging.debug("    %s is a dir, skipping",filename)
-                    continue
-                cmd = "cp %s /etc/remote.run" %filename
-                mv_common.runcmd(cmd)
+            remote_path="%s/remotes/%s/%s" %(templates,remotebucket,Remotetype)
+
+        files =  remote_path + "/lircd*"
+        logging.debug("    Using %s",files)
+        for filename in glob.glob(files):
+            # Ignore subfolders
+            if os.path.isdir (filename):
+                logging.debug("    %s is a dir, skipping",filename)
+                continue
+            include_file("/etc/lircd.conf",filename)
+        #files = templates + "/remotes/" + Remotetype + "/lircrc*"
+        files = remote_path + "/lircrc*"
+        logging.debug("    Using %s",files)
+        for filename in glob.glob(files):
+            # Ignore subfolders
+            if os.path.isdir (filename):
+                logging.debug("    %s is a dir, skipping",filename)
+                continue
+            include_file("/etc/lircrc",filename)
+        files = remote_path + "/remote.run*"
+        logging.debug("    Using %s",files)
+        for filename in glob.glob(files):
+            # Ignore subfolders
+            if os.path.isdir (filename):
+                logging.debug("    %s is a dir, skipping",filename)
+                continue
+            cmd = "cp %s /etc/remote.run" %filename
+            mv_common.runcmd(cmd)
 
 
         cmd =  "chmod 755 /etc/lircrc /etc/remote.run"
@@ -355,7 +329,10 @@ def setup_ir(systemconfig, data_config):
         else:
             remotetype = systemconfig.get("Remotetype")
 
-        setup_ir_remote(remotetype,systemconfig.get("TEMPLATES"),data_config.MYTHHOME,systemconfig.get("HostBlasterType"))
+        setup_ir_remote(remotetype,systemconfig.get("TEMPLATES"),
+                            data_config.MYTHHOME,
+                            systemconfig.get("HostBlasterType"),
+                            systemconfig.get("Remotebucket"))
         setup_lirc_links(data_config.MYTHHOME)
 
         if systemconfig.get("ReceiverType"):