From 9392154ab75823a668d634441a0a15253e2d83e8 Mon Sep 17 00:00:00 2001 From: Griatch Date: Thu, 5 Mar 2015 15:33:09 +0100 Subject: [PATCH] Added --settings option to evennia-launcher. --- evennia/server/evennia_launcher.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index 990b69f38a..819762547b 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -903,8 +903,8 @@ def main(): help="Start given server component under the Python profiler.") parser.add_argument('--dummyrunner', nargs=1, action='store', dest='dummyrunner', metavar="N", help="Tests a running server by connecting N dummy players to it.") - parser.add_argument('--settings', nargs=1, action='store', dest='customsettings', metavar="/rel/path/to/file", - help="Start evennia with an alternative settings file.") + parser.add_argument('--settings', nargs=1, action='store', dest='altsettings', default=None, metavar="filename.py", + help="Start evennia with alternative settings file in gamedir/server/conf/.") parser.add_argument("option", nargs='?', default="noop", help="Operational mode: 'start', 'stop', 'restart' or 'menu'.") parser.add_argument("service", metavar="component", nargs='?', default="all", @@ -933,6 +933,13 @@ def main(): print show_version_info(option=="help") sys.exit() + if args.altsettings: + sfile = args.altsettings[0] + global SETTINGSFILE, SETTINGS_DOTPATH + SETTINGSFILE = sfile + SETTINGS_DOTPATH = "server.conf.%s" % sfile.rstrip(".py") + print "Using settings file '%s' (%s)." % (SETTINGSFILE, SETTINGS_DOTPATH) + if args.dummyrunner: # launch the dummy runner init_game_directory(CURRENT_DIR, check_db=True)