Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error when running evennia xyzgrid cmdline

Browse source
This commit is contained in:
Griatch 2022-01-31 22:11:28 +01:00
parent 5859de7054
commit 09ef71c97e
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/contrib/grid/xyzgrid/__init__.py
View file

@ -3,7 +3,6 @@ XYZGrid - Griatch 2021
""" """
from . import commands # noqa
from . import example # noqa from . import example # noqa
from . import launchcmd # noqa from . import launchcmd # noqa
from . import prototypes # noqa from . import prototypes # noqa
@ -13,3 +12,4 @@ from . import xymap # noqa
from . import xymap_legend # noqa from . import xymap_legend # noqa
from . import xyzgrid # noqa from . import xyzgrid # noqa
from . import xyzroom # noqa from . import xyzroom # noqa
from . import commands # noqa

15
evennia/server/evennia_launcher.py
View file

@ -204,7 +204,7 @@ ERROR_SETTINGS = """
) )
ERROR_INITSETTINGS = """ ERROR_INITSETTINGS = """
ERROR: 'evennia --initsettings' must be called from the root of u ERROR: 'evennia --initsettings' must be called from the root of
your game directory, since it tries to (re)create the new your game directory, since it tries to (re)create the new
settings.py file in a subfolder server/conf/. settings.py file in a subfolder server/conf/.
""" """
@ -2323,6 +2323,7 @@ def main():
global TEST_MODE global TEST_MODE
TEST_MODE = True TEST_MODE = True
# init the db/game dir, if needed
init_game_directory(CURRENT_DIR, check_db=check_db, need_gamedir=need_gamedir) init_game_directory(CURRENT_DIR, check_db=check_db, need_gamedir=need_gamedir)
if option == "migrate": if option == "migrate":
@ -2334,12 +2335,12 @@ def main():
if run_custom_commands(option, *unknown_args): if run_custom_commands(option, *unknown_args):
# run any custom commands # run any custom commands
sys.exit() sys.exit()
else:
# pass on to the core django manager - re-parse the entire input line # pass on to the core django manager - re-parse the entire input line
# but keep 'evennia' as the name instead of django-admin. This is # but keep 'evennia' as the name instead of django-admin. This is
# an exit condition. # an exit condition.
sys.argv[0] = re.sub(r"(-script\.pyw?|\.exe)?$", "", sys.argv[0]) sys.argv[0] = re.sub(r"(-script\.pyw?|\.exe)?$", "", sys.argv[0])
sys.exit(execute_from_command_line(sys.argv)) sys.exit(execute_from_command_line(sys.argv))
elif not args.tail_log: elif not args.tail_log:
# no input; print evennia info (don't pring if we're tailing log) # no input; print evennia info (don't pring if we're tailing log)