From a0b1b34c71e46304f7024f0570db92f4577303b5 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 2 Oct 2014 09:55:26 +0100 Subject: [PATCH] Make instructions synctl gives for generateing a config file actuall generate a config file. Also, make synctil run synapse correctly by invoking a module such that the path is correct to pull in other bits from the working directory rather than requiring them to be on the PYTHONPATH (which would lead to people being very confused when they edit source in the working directory and their changes do not take effect). --- synctl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synctl b/synctl index 0f83e9cb1f..7523fd3dbc 100755 --- a/synctl +++ b/synctl @@ -1,6 +1,6 @@ #!/bin/bash -SYNAPSE="synapse/app/homeserver.py" +SYNAPSE="python -m synapse.app.homeserver" CONFIGFILE="homeserver.yaml" PIDFILE="homeserver.pid" @@ -14,7 +14,7 @@ case "$1" in start) if [ ! -f "$CONFIGFILE" ]; then echo "No config file found" - echo "To generate a config file, run 'python --generate-config'" + echo "To generate a config file, run '$SYNAPSE -c $CONFIGFILE --generate-config'" exit 1 fi