aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2015-12-22 16:35:48 +0100
committerCédric Bonhomme <cedric@cedricbonhomme.org>2015-12-22 16:35:48 +0100
commit3c9d9803d70f63d7a67ea71a1b1e3bf515e7cacd (patch)
tree84b4749cc76bc4d7e5d4a3ba0f0064e69ce87ff6
parentUpdated link of post-deploy script for Heroku. (diff)
downloadnewspipe-3c9d9803d70f63d7a67ea71a1b1e3bf515e7cacd.tar.gz
newspipe-3c9d9803d70f63d7a67ea71a1b1e3bf515e7cacd.tar.bz2
newspipe-3c9d9803d70f63d7a67ea71a1b1e3bf515e7cacd.zip
Updated install script.
-rwxr-xr-xinstall.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/install.sh b/install.sh
index 7e5c68ed..028dd8db 100755
--- a/install.sh
+++ b/install.sh
@@ -5,7 +5,7 @@
# for Python 3.
#
-PYTHON_VERSION="3.4"
+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
@@ -14,11 +14,11 @@ sed -i '/psycopg2/d' requirements.txt
sudo pip$PYTHON_VERSION install --upgrade -r requirements.txt
# Initializes the configuration file
-cp conf/conf.cfg-sample conf/conf.cfg
+cp src/conf/conf.cfg-sample src/conf/conf.cfg
# Delete default database configuration
-sed -i '/database/d' conf/conf.cfg
-sed -i '/database_url/d' conf/conf.cfg
+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
@@ -31,13 +31,13 @@ if [ "$1" == postgres ]; then
echo "GRANT ALL PRIVILEGES ON DATABASE aggregator TO pgsqluser;" | sudo -u postgres psql
# Add configuration lines for PostgreSQL
- echo '[database]' >> conf/conf.cfg
- echo 'database_url = postgres://pgsqluser:pgsqlpwd@127.0.0.1:5433/aggregator' >> conf/conf.cfg
+ 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 '[database]' >> conf/conf.cfg
- echo 'database_url = sqlite+pysqlite:///jarr.db' >> conf/conf.cfg
+ echo '[database]' >> src/conf/conf.cfg
+ echo 'database_url = sqlite+pysqlite:///jarr.db' >> src/conf/conf.cfg
fi
python$PYTHON_VERSION manager.py db_empty
bgstack15