git mv master/autotua master/master

This is to fix a bug where setup-master.py used to take up ./autotua
instead of the slave autotua modules.

14 files changed, 2 insertions, 2 deletions

diff --git a/master/autotua/__init__.py b/master/master/__init__.py
index e69de29..e69de29 100644
--- a/master/autotua/__init__.py
+++ b/master/master/__init__.py
diff --git a/master/autotua/const.py b/master/master/const.py
index e96d94c..e96d94c 100644
--- a/master/autotua/const.py
+++ b/master/master/const.py
diff --git a/master/autotua/media/css/default.css b/master/master/media/css/default.css
index a7ad6d4..a7ad6d4 100644
--- a/master/autotua/media/css/default.css
+++ b/master/master/media/css/default.css
diff --git a/master/autotua/media/images/404.png b/master/master/media/images/404.png
index f54fa84..f54fa84 100644
--- a/master/autotua/media/images/404.png
+++ b/master/master/media/images/404.png
diff --git a/master/autotua/media/images/topcorners.gif b/master/master/media/images/topcorners.gif
index a0fa668..a0fa668 100644
--- a/master/autotua/media/images/topcorners.gif
+++ b/master/master/media/images/topcorners.gif
diff --git a/master/autotua/models.py b/master/master/models.py
index f5004a5..f5004a5 100644
--- a/master/autotua/models.py
+++ b/master/master/models.py
diff --git a/master/autotua/process/__init__.py b/master/master/process/__init__.py
index 88e9bb3..88e9bb3 100644
--- a/master/autotua/process/__init__.py
+++ b/master/master/process/__init__.py
diff --git a/master/autotua/slave_api.py b/master/master/slave_api.py
index 686009d..686009d 100644
--- a/master/autotua/slave_api.py
+++ b/master/master/slave_api.py
diff --git a/master/autotua/templates/basic.html b/master/master/templates/basic.html
index 0147cfa..0147cfa 100644
--- a/master/autotua/templates/basic.html
+++ b/master/master/templates/basic.html
diff --git a/master/autotua/templates/jobs.html b/master/master/templates/jobs.html
index f334921..f334921 100644
--- a/master/autotua/templates/jobs.html
+++ b/master/master/templates/jobs.html
diff --git a/master/autotua/templates/userpage.html b/master/master/templates/userpage.html
index 6f68c97..6f68c97 100644
--- a/master/autotua/templates/userpage.html
+++ b/master/master/templates/userpage.html
diff --git a/master/autotua/urls.py b/master/master/urls.py
index 58c62f1..58c62f1 100644
--- a/master/autotua/urls.py
+++ b/master/master/urls.py
diff --git a/master/autotua/views.py b/master/master/views.py
index b295a3d..b295a3d 100644
--- a/master/autotua/views.py
+++ b/master/master/views.py
diff --git a/master/setup-master.py b/master/setup-master.py
index 4a6b67f..86a718e 100755
--- a/master/setup-master.py
+++ b/master/setup-master.py
@@ -50,14 +50,14 @@ def install_master():
 
     management.call_command('startproject', DESTDIR)
     if SYMLINKS:
-        os.symlink(cwd+'/autotua', DESTDIR+'/master')
+        os.symlink(cwd+'/master', DESTDIR+'/master')
         for file in ['autotua_settings.py', '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+'/autotua', DESTDIR+'/master')
+        shutil.copytree(cwd+'/master', DESTDIR+'/master')
         for file in ['autotua_settings.py', 'urls.py']:
             shutil.copy(cwd+'/custom/'+file, DESTDIR)
     settings = open(DESTDIR+'/settings.py', 'a')