Merge branch 'master' of git@github.com:fnp/wolnelektury

[wolnelektury.git] / deployment.py

diff --git a/deployment.py b/deployment.py
old mode 100644 (file)
new mode 100755 (executable)
index b677fdf..ab19880
--- a/deployment.py
+++ b/deployment.py
@@ -23,18 +23,21 @@ def restart_wsgi():
 def update_application():
     print "Updating repository.",
     os.system("cd %s; git pull" % PROJECT_ROOT)
 def update_application():
     print "Updating repository.",
     os.system("cd %s; git pull" % PROJECT_ROOT)

+

     print "Installing requirements"
     print "Installing requirements"

-    os.system("pip install -r %s" % os.path.join(PROJECT_ROOT, 'requirements.txt'))
+    os.system("%s install -r %s" % (PIP, os.path.join(PROJECT_ROOT, 'requirements.txt')))
+

     print "Installing local requirements"
     print "Installing local requirements"

-    os.system("pip install -r %s" % os.path.join(ROOT, 'etc', 'requirements.txt'))
+    os.system("%s install -r %s" % (PIP, os.path.join(ROOT, 'etc', 'requirements.txt')))

     print "done."
 
     print "done."
 

-ROOT = os.path.dirname(os.path.abspath(__file__))
+ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

 
 PYTHON = os.path.join(ROOT, 'pythonenv', 'bin', 'python')
 
 PYTHON = os.path.join(ROOT, 'pythonenv', 'bin', 'python')

+PIP = os.path.join(ROOT, 'pythonenv', 'bin', 'pip')

 PYTHON_SITE = os.path.join(ROOT, 'pythonenv', 'lib', 'python2.6', 'site-packages')
 
 PYTHON_SITE = os.path.join(ROOT, 'pythonenv', 'lib', 'python2.6', 'site-packages')
 

-PROJECT_NAME = 'redakcja'
+PROJECT_NAME = 'wolnelektury'

 PROJECT_ROOT = os.path.join(ROOT, 'application')
 
 MEDIA_ROOT = os.path.join(ROOT, 'www', 'media')
 PROJECT_ROOT = os.path.join(ROOT, 'application')
 
 MEDIA_ROOT = os.path.join(ROOT, 'www', 'media')