fix conf

diff --git a/conf/etc/telecaster/telecaster.xml b/conf/etc/telecaster/telecaster.xml
index 456fcc7b865cd8a83328a6a2fa13256fce83c6f7..3faece54d6dc503485fe1d2a22ca58ca31ae6c62 100644 (file)
--- a/conf/etc/telecaster/telecaster.xml
+++ b/conf/etc/telecaster/telecaster.xml
@@ -12,7 +12,7 @@
     </deefuzzer>
     <media>
         <record>true</record>
-        <play_dir>/home/telecaster/media/ogg</play_dir>
+        <play_dir>/home/telecaster/.telecaster/media/ogg</play_dir>
         <rec_dir>/home/telecaster/archives</rec_dir>
         <format>ogg</format>
         <bitrate>64</bitrate>

diff --git a/install.py b/install.py
index 0f5235aa4804667bba2b3de074aa7f1dd347261f..e411cd86c0fee7a94056a00d675c2d9f60a06f81 100644 (file)
--- a/install.py
+++ b/install.py
@@ -65,9 +65,6 @@ class Install(object):
         self.deefuzzer_log_dir = '/var/log/deefuzzer'
         self.conf_dir = '/etc/telecaster'
         self.init_dirs = ['/etc/init.d/', '/etc/default/']
-        self.home_dirs = ['fluxbox', 'vnc']
-        self.media_dir = self.home + os.sep + 'media'
-
         self.daemons = ['jackd', 'vncserver']
         self.apache_conf = '/etc/apache2/sites-available/telecaster.conf'
 
@@ -108,17 +105,13 @@ class Install(object):
         for file in in_files:
             shutil.copy('conf'+self.conf_dir+os.sep+file, self.conf_dir+os.sep+file)
 
-        for dir in self.home_dirs:
+        for dir in os.listdir('conf/home'):
             home_dir = self.home + '/.' + dir
             if not os.path.exists(home_dir):
                 os.makedirs(home_dir)
             os.system('cp -r conf/home/'+dir + ' ' + home_dir)
             self.chown(home_dir)
 
-        dir = 'media'
-        if not os.path.exists(self.home+os.sep+dir):
-            shutil.copytree('conf/home/'+dir, self.home+os.sep+dir)
-
         shutil.copy('conf'+self.apache_conf, self.apache_conf)
         os.system('a2ensite telecaster.conf')
         os.system('/etc/init.d/apache2 reload')
@@ -146,7 +139,7 @@ class Install(object):
         if not os.path.islink(init_link):
             os.system('ln -s /etc/init.d/vncserver '+init_link)
 
-
+        os.system('cp -r conf/usr/* /usr/')
 
     def run(self):
         if self.options['keepinit'] == False: