Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.0

15 files changed, 4 insertions, 2 deletions

diff --git a/scripts/check_auth.py b/scripts-dev/check_auth.py
index b889ac7fa7..b889ac7fa7 100644
--- a/scripts/check_auth.py
+++ b/scripts-dev/check_auth.py
diff --git a/scripts/check_event_hash.py b/scripts-dev/check_event_hash.py
index 679afbd268..679afbd268 100644
--- a/scripts/check_event_hash.py
+++ b/scripts-dev/check_event_hash.py
diff --git a/scripts/check_signature.py b/scripts-dev/check_signature.py
index 59e3d603ac..59e3d603ac 100644
--- a/scripts/check_signature.py
+++ b/scripts-dev/check_signature.py
diff --git a/scripts/copyrighter-sql.pl b/scripts-dev/copyrighter-sql.pl
index 890e51e587..890e51e587 100755
--- a/scripts/copyrighter-sql.pl
+++ b/scripts-dev/copyrighter-sql.pl
diff --git a/scripts/copyrighter.pl b/scripts-dev/copyrighter.pl
index a913d74c8d..a913d74c8d 100755
--- a/scripts/copyrighter.pl
+++ b/scripts-dev/copyrighter.pl
diff --git a/scripts/database-save.sh b/scripts-dev/database-save.sh
index 040c8a4943..040c8a4943 100755
--- a/scripts/database-save.sh
+++ b/scripts-dev/database-save.sh
diff --git a/scripts/federation_client.py b/scripts-dev/federation_client.py
index ea62dceb36..ea62dceb36 100644
--- a/scripts/federation_client.py
+++ b/scripts-dev/federation_client.py
diff --git a/scripts/hash_history.py b/scripts-dev/hash_history.py
index bdad530af8..bdad530af8 100644
--- a/scripts/hash_history.py
+++ b/scripts-dev/hash_history.py
diff --git a/scripts/make_identicons.pl b/scripts-dev/make_identicons.pl
index cbff63e298..cbff63e298 100755
--- a/scripts/make_identicons.pl
+++ b/scripts-dev/make_identicons.pl
diff --git a/scripts/nuke-room-from-db.sh b/scripts-dev/nuke-room-from-db.sh
index 58c036c896..58c036c896 100755
--- a/scripts/nuke-room-from-db.sh
+++ b/scripts-dev/nuke-room-from-db.sh
diff --git a/scripts/sphinx_api_docs.sh b/scripts-dev/sphinx_api_docs.sh
index ee72b29657..ee72b29657 100644
--- a/scripts/sphinx_api_docs.sh
+++ b/scripts-dev/sphinx_api_docs.sh
diff --git a/scripts/port_from_sqlite_to_postgres.py b/scripts/port_from_sqlite_to_postgres.py
index da760af087..f98342db51 100644..100755
--- a/scripts/port_from_sqlite_to_postgres.py
+++ b/scripts/port_from_sqlite_to_postgres.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # Copyright 2015 OpenMarket Ltd
 #
diff --git a/register_new_matrix_user b/scripts/register_new_matrix_user
index 0ca83795a3..0ca83795a3 100755
--- a/register_new_matrix_user
+++ b/scripts/register_new_matrix_user
diff --git a/scripts/upgrade_db_to_v0.6.0.py b/scripts/upgrade_db_to_v0.6.0.py
index 298e9c0789..f466ca510e 100644..100755
--- a/scripts/upgrade_db_to_v0.6.0.py
+++ b/scripts/upgrade_db_to_v0.6.0.py
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env python
 from synapse.storage import SCHEMA_VERSION, read_schema
 from synapse.storage._base import SQLBaseStore
 from synapse.storage.signatures import SignatureStore
diff --git a/setup.py b/setup.py
index ab24159be7..f9929591e7 100755
--- a/setup.py
+++ b/setup.py
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import glob
 import os
 from setuptools import setup, find_packages
 
@@ -55,5 +56,5 @@ setup(
     include_package_data=True,
     zip_safe=False,
     long_description=long_description,
-    scripts=["synctl", "register_new_matrix_user"],
+    scripts=["synctl"] + glob.glob("scripts/*"),
 )