]> git.parisson.com Git - telecaster-server.git/commitdiff
fix install
authoryomguy <yomguy@parisson.com>
Mon, 15 Jul 2013 22:39:12 +0000 (00:39 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 15 Jul 2013 22:39:12 +0000 (00:39 +0200)
setup.py
tcserver/install.py

index 555b03fe22da5c6dcfc06c69d96a4d3166dd6eba..f310ad11bc57a40b9ac71910c1c5bc97b987d534 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,7 @@ setup(
   zip_safe = False,
 )
 
+import tcserver
 tcserver.install.run()
 
 
index 22cbda0908ead0df06069341c5edde0d8fa3c32d..ddd5c934db597f86fa1ba0f9c21aae0edd5b0080 100644 (file)
@@ -90,10 +90,7 @@ class Install(object):
 
         for conf_dir in [self.conf_dir, self.stream_m_conf_dir]:
             in_files = os.listdir('conf'+conf_dir)
-            if not os.path.exists(conf_dir):
-                os.makedirs(conf_dir)
-            for file in in_files:
-                shutil.copy('conf'+conf_dir+os.sep+file, conf_dir+os.sep+file)
+            os.system('cp -ra conf'+ conf_dir + '/*' + ' ' + conf_dir)
             self.chown(conf_dir)
 
         for dir in os.listdir('conf/home'):