Merge pull request #2533 from normanjaeckel/FixHelpText

Fixed error in README and help texts of start script. Fixed #2532.
This commit is contained in:
Emanuel Schütze 2016-10-26 15:08:29 +02:00 committed by GitHub
commit 4d48f2d8a5
2 changed files with 9 additions and 6 deletions

View File

@ -89,7 +89,7 @@ on port 8000. That means that the server will be available to everyone on your
local network (at least for commonly used network configurations).
If you use a virtual environment (see step b.), do not forget to activate
the environment before restart after you have closed the terminal::
the environment before restart after you closed the terminal::
$ source .virtualenv/bin/activate
@ -101,7 +101,7 @@ You can store settings, database and other personal files in a local
subdirectory and use these files e. g. if you want to run multiple
instances of OpenSlides::
$ openslides --local-installation
$ openslides start --local-installation
2. Installation on Windows

View File

@ -45,7 +45,9 @@ def get_parser():
"""
Parses all command line arguments.
"""
if len(sys.argv) == 1 and not is_local_installation():
if len(sys.argv) == 1:
# Use start subcommand if called by openslides console script without
# any other arguments.
sys.argv.append('start')
# Init parser
@ -55,7 +57,7 @@ def get_parser():
If it is called without any argument, this will be treated as
if it is called with the 'start' subcommand. That means
OpenSlides will setup default settings and database, start the
tornado webserver, launch the default web browser and open the
webserver, launch the default web browser and open the
webinterface.
"""
epilog = """
@ -86,7 +88,7 @@ def get_parser():
# Subcommand start
start_help = (
'Setup settings and database, start tornado webserver, launch the '
'Setup settings and database, start webserver, launch the '
'default web browser and open the webinterface. The environment '
'variable DJANGO_SETTINGS_MODULE is ignored.')
subcommand_start = subparsers.add_parser(
@ -193,7 +195,8 @@ def start(args):
'{}:{}'.format(args.host, args.port),
'--noreload',
'--insecure',
'--nothreading'])
'--nothreading',
])
def createsettings(args):