From 8be30f67f2f21422d346c06c628d6343e83f3ed2 Mon Sep 17 00:00:00 2001
From: Alvaro Lorenzo <allore@noc.ac.uk>
Date: Wed, 6 Apr 2016 09:49:52 +0000
Subject: [PATCH] Removed the use of pypy from deploy.

Added a few related libraies installation on install.
---
 deploy.sh  | 23 ++++++++---------------
 install.sh |  0
 2 files changed, 8 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 install.sh

diff --git a/deploy.sh b/deploy.sh
index 568986b..6fe44f0 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -47,20 +47,13 @@ git clone git@gitlab.noc.soton.ac.uk:owanes/gliders-website.git
 # then fetch all our log files and parse them!
 cd gliders-tools
 python setup.py install
-
-if [ -f /usr/bin/pypy ]; then
-    mkdir -p /home/gliders/pypyenv
-    virtualenv -p /usr/bin/pypy /home/gliders/pypyenv --system-site-packages
-    source /home/gliders/pypyenv/bin/activate
-    pypy -m pip install pymysql
-    pypy -m pip install python-dateutil
-    pypy -m pip install lxml==3.4.4
-    pypy -m pip install sqlalchemy
-    pypy -m pip install elasticsearch
-    pypy -m pip install pymongo
-    pypy setup.py install
-    source /home/gliders/pythonenv/bin/activate
-fi
+pip install pymysql
+pip install python-dateutil
+pip install lxml==3.4.4
+pip install sqlalchemy
+pip install elasticsearch
+pip install pymongo
+python setup.py install
 
 sudo cp fetchlogs.service /etc/systemd/system/
 sudo systemctl enable fetchlogs
@@ -71,7 +64,7 @@ mysql -u root -p$pass < new_schema.sql
 echo "CREATE USER 'gliders'@'%' IDENTIFIED BY '"$pass"' ;" | mysql -u root -p$pass
 echo "GRANT ALL ON gliders.* TO 'gliders'@'%';" | mysql -u root -p$pass
 cd bin
-sh migrate_data.sh
+sh migrate_data.sh $pass
 sudo systemctl start fetchlogs
 
 # Set up a GitHub API key and add it to .bash_profile
diff --git a/install.sh b/install.sh
old mode 100644
new mode 100755
-- 
GitLab