aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'master/setup-master.py')
-rwxr-xr-xmaster/setup-master.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/master/setup-master.py b/master/setup-master.py
index 5be5803..6608bb1 100755
--- a/master/setup-master.py
+++ b/master/setup-master.py
@@ -52,18 +52,20 @@ def install_master():
management.call_command('startproject', DESTDIR)
if SYMLINKS:
os.symlink(cwd+'/master', DESTDIR+'/master')
- for file in ['autotua_settings.py', 'urls.py']:
+ for file in ['urls.py']:
dest_file = DESTDIR+'/'+file
if os.path.isfile(dest_file):
os.remove(dest_file)
os.symlink(cwd+'/custom/'+file, dest_file)
else:
shutil.copytree(cwd+'/master', DESTDIR+'/master')
- for file in ['autotua_settings.py', 'urls.py']:
+ for file in ['urls.py']:
shutil.copy(cwd+'/custom/'+file, DESTDIR)
settings = open(DESTDIR+'/settings.py', 'a')
- settings.write('\nfrom autotua_settings import *\n')
+ master_settings = open(cwd+'/custom/merge_settings.py')
+ settings.write('\n'+master_settings.read())
settings.close()
+ master_settings.close()
# Install icons
icondir = os.path.abspath(cwd+'/icons')