aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2017-04-07 11:49:36 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2017-04-07 11:49:36 +0200
commit246b00e7e67f2b3f84da9b3191e8fc0f582c742a (patch)
treebfcd387bf5cf2c6668073a6fd186617c7f836955
parentMerge branch 'master' into bookmark (diff)
parentno more submodule for bootstrap (diff)
downloadnewspipe-246b00e7e67f2b3f84da9b3191e8fc0f582c742a.tar.gz
newspipe-246b00e7e67f2b3f84da9b3191e8fc0f582c742a.tar.bz2
newspipe-246b00e7e67f2b3f84da9b3191e8fc0f582c742a.zip
Merge branch 'master' into bookmark
-rw-r--r--install.sh14
1 files changed, 1 insertions, 13 deletions
diff --git a/install.sh b/install.sh
index e84cfc76..a561979d 100644
--- a/install.sh
+++ b/install.sh
@@ -12,6 +12,7 @@ sudo apt-get install -y libxml2-dev libxslt1-dev > /dev/null # for lxml
sudo apt-get install -y libssl-dev openssl > /dev/null # for pip
+
PYTHON_VERSION=3.6.1
echo "Installation of Python..."
if [ "$1" == postgres ]; then
@@ -33,7 +34,6 @@ sudo rm -Rf Python-$PYTHON_VERSION/
-
PYTHON_VERSION=3.6
echo "Installing required Python libraries..."
sed -i '/psycopg2/d' requirements.txt > /dev/null
@@ -42,7 +42,6 @@ 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
# Delete default database configuration
@@ -51,7 +50,6 @@ sed -i '/database_url/d' src/conf/conf.cfg
-
# Configuration of the database
if [ "$1" == postgres ]; then
echo "Installing requirements for PostgreSQL..."
@@ -78,22 +76,12 @@ fi
-
echo "Initialization of the database..."
python$PYTHON_VERSION src/manager.py db_empty
python$PYTHON_VERSION src/manager.py db_create
-
-# Bootstrap
-echo "Retrieving bootstrap..."
-git submodule init > /dev/null
-git submodule update > /dev/null
-
-
-
-
echo "Installation terminated."
echo "Launch Newspipe with the command:"
echo -e "\tpython$PYTHON_VERSION src/runserver.py"
bgstack15