aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2016-02-08 07:12:19 +0100
committerCédric Bonhomme <cedric@cedricbonhomme.org>2016-02-08 07:12:19 +0100
commit7d5298816d931ca4eadd0ac67fa2df8f4188aaeb (patch)
tree4b68ebfc5d2e21e23809e3e7a12d2da43e0e21d7
parentMove the dashboard button in the user's menu. (diff)
downloadnewspipe-7d5298816d931ca4eadd0ac67fa2df8f4188aaeb.tar.gz
newspipe-7d5298816d931ca4eadd0ac67fa2df8f4188aaeb.tar.bz2
newspipe-7d5298816d931ca4eadd0ac67fa2df8f4188aaeb.zip
Updated install script.
-rwxr-xr-xinstall.sh4
-rw-r--r--migrations/versions/3f83bfe93fc_adding_category.py42
2 files changed, 4 insertions, 42 deletions
diff --git a/install.sh b/install.sh
index 5eb0ec13..867dfc78 100755
--- a/install.sh
+++ b/install.sh
@@ -42,3 +42,7 @@ fi
python$PYTHON_VERSION src/manager.py db_empty
python$PYTHON_VERSION src/manager.py db_create
+
+# Bootstrap
+git submodule init
+git submodule update
diff --git a/migrations/versions/3f83bfe93fc_adding_category.py b/migrations/versions/3f83bfe93fc_adding_category.py
deleted file mode 100644
index bd65a01f..00000000
--- a/migrations/versions/3f83bfe93fc_adding_category.py
+++ /dev/null
@@ -1,42 +0,0 @@
-"""adding category
-
-Revision ID: 3f83bfe93fc
-Revises: 25ca960a207
-Create Date: 2015-09-01 14:15:04.212563
-"""
-
-# revision identifiers, used by Alembic.
-revision = '3f83bfe93fc'
-down_revision = '25ca960a207'
-
-import conf
-from alembic import op
-import sqlalchemy as sa
-
-
-def upgrade():
- op.create_table('category',
- sa.Column('id', sa.Integer(), nullable=False),
- sa.Column('name', sa.String(), nullable=True),
- sa.Column('user_id', sa.Integer(), nullable=True),
- sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
- sa.PrimaryKeyConstraint('id'))
- op.add_column('article',
- sa.Column('category_id', sa.Integer(), nullable=True))
- op.add_column('feed',
- sa.Column('category_id', sa.Integer(), nullable=True))
- if 'sqlite' not in conf.SQLALCHEMY_DATABASE_URI:
- op.create_foreign_key(None, 'article', 'category',
- ['category_id'], ['id'])
- op.create_foreign_key(None, 'feed', 'category',
- ['category_id'], ['id'])
-
-
-def downgrade():
- if 'sqlite' not in conf.SQLALCHEMY_DATABASE_URI:
- op.drop_constraint(None, 'feed', type_='foreignkey')
- op.drop_constraint(None, 'feed', type_='foreignkey')
- op.drop_column('feed', 'category_id')
- op.drop_constraint(None, 'article', type_='foreignkey')
- op.drop_column('article', 'category_id')
- op.drop_table('category')
bgstack15