From 0dffa72344bae25886ceca09c898ae90be3f3eb4 Mon Sep 17 00:00:00 2001
From: Jarmil <jarmil.halamicek@seznam.cz>
Date: Tue, 24 Sep 2019 16:08:35 +0200
Subject: [PATCH] fixed install and run scripts

---
 install.sh | 14 ++------------
 src/run.sh |  2 ++
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/install.sh b/install.sh
index 857a528..d7c198e 100755
--- a/install.sh
+++ b/install.sh
@@ -2,18 +2,8 @@ virtualenv -p python3.5 venv
 
 source ./venv/bin/activate
 
-pip install Django==2.0.3      # 2.0.3
-
-# s binarne distribuovanou libssl 
-pip install psycopg2    
-
-pip install django-statici18n   # preklad Javascript souboru
-
-# nahrada za SUDS, zalozeno na lxml
-#pip install zeep
-
-pip install bleach
-
+pip install --upgrade pip
+pip install -r src/pip-requirements.txt
 
 ##
 #       Keycloak SSO
diff --git a/src/run.sh b/src/run.sh
index 97858e7..7b17a7f 100755
--- a/src/run.sh
+++ b/src/run.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source ../venv/bin/activate
+
 if [[ "x$1" == "x+" ]]; then
   ./manage.py runserver_plus 127.0.0.1:8010
 else