From 166e12b0d2c3350b28ed159b43a738cb09ebf1f6 Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Tue, 27 Sep 2016 09:35:38 +0200
Subject: Fixed a bug with SQLite support.

---
 install.sh | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'install.sh')

diff --git a/install.sh b/install.sh
index 867dfc78..a0dc15ca 100755
--- a/install.sh
+++ b/install.sh
@@ -1,17 +1,17 @@
 #! /usr/bin/env bash
 
 #
-# This script install all dependencies and configure JARR
-# for Python 3.
+# This script install all dependencies and configure JARR for Python 3.
 #
 
 PYTHON_VERSION="3.5"
 
-sudo apt-get install -y python$PYTHON_VERSION libpq-dev python$PYTHON_VERSION-dev build-essential git
-sudo apt-get install -y libxml2-dev libxslt1-dev # for lxml
+#sudo apt-get install -y python$PYTHON_VERSION libpq-dev python$PYTHON_VERSION-dev build-essential git > /dev/null
+sudo apt-get install -y libxml2-dev libxslt1-dev > /dev/null # for lxml
 
-sed -i '/psycopg2/d' requirements.txt
-sudo pip$PYTHON_VERSION install --upgrade -r requirements.txt
+echo "Installing required Python libraries..."
+sed -i '/psycopg2/d' requirements.txt > /dev/null
+sudo pip$PYTHON_VERSION install --upgrade -r requirements.txt > /dev/null
 
 # Initializes the configuration file
 cp src/conf/conf.cfg-sample src/conf/conf.cfg
@@ -21,8 +21,10 @@ sed -i '/database/d' src/conf/conf.cfg
 sed -i '/database_url/d' src/conf/conf.cfg
 
 if [ "$1" == postgres ]; then
-    sudo apt-get install -y postgresql postgresql-server-dev-9.4 postgresql-client
-    sudo pip$PYTHON_VERSION install psycopg2
+    echo "Installing requirements for PostgreSQL..."
+    sudo apt-get install -y postgresql postgresql-server-dev-9.4 postgresql-client > /dev/null
+    sudo pip$PYTHON_VERSION install psycopg2 > /dev/null
+    echo "Configuring the database..."
     echo "127.0.0.1:5433:aggregator:pgsqluser:pgsqlpwd" > ~/.pgpass
     chmod 0600 ~/.pgpass
     sudo -u postgres createuser pgsqluser --no-superuser --createdb --no-createrole
@@ -34,15 +36,22 @@ if [ "$1" == postgres ]; then
     echo '[database]' >> src/conf/conf.cfg
     echo 'database_url = postgres://pgsqluser:pgsqlpwd@127.0.0.1:5433/aggregator' >> src/conf/conf.cfg
 elif [ "$1" == sqlite ]; then
-    sudo pip$PYTHON_VERSION install pysqlite # not working with Python 3!
     # Add configuration lines for SQLite
+    echo "Configuring the SQLite database..."
     echo '[database]' >> src/conf/conf.cfg
-    echo 'database_url = sqlite+pysqlite:///jarr.db' >> src/conf/conf.cfg
+    echo 'database_url = sqlite:///jarr.db' >> src/conf/conf.cfg
 fi
 
+echo "Initialization of the database..."
 python$PYTHON_VERSION src/manager.py db_empty
 python$PYTHON_VERSION src/manager.py db_create
 
 # Bootstrap
-git submodule init
-git submodule update
+echo "Retrieving bootstrap..."
+git submodule init > /dev/null
+git submodule update > /dev/null
+
+
+echo "Installation terminated."
+echo "Launch JARR with the command:"
+echo -e "\tpython$PYTHON_VERSION src/runserver.py"
-- 
cgit