From ec4e985c399848f769350015ecb22b20e44b1666 Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 10 Feb 2015 00:12:41 +0100 Subject: [PATCH] Made sure to have the launcher send the gamedir as the first entry in the environment for the portal and launcher. This makes it possible to start evennia from anywhere in the game folder. --- evennia/server/evennia_runner.py | 1 + evennia/server/portal/portal.py | 5 ----- evennia/server/server.py | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/evennia/server/evennia_runner.py b/evennia/server/evennia_runner.py index e1269e149d..00a5d77a5a 100644 --- a/evennia/server/evennia_runner.py +++ b/evennia/server/evennia_runner.py @@ -91,6 +91,7 @@ def getenv(): """ sep = ";" if os.name == "nt" else ":" env = os.environ.copy() + sys.path.insert(0, GAMEDIR) env['PYTHONPATH'] = sep.join(sys.path) return env diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py index 38d165cf31..f36300b94f 100644 --- a/evennia/server/portal/portal.py +++ b/evennia/server/portal/portal.py @@ -11,11 +11,6 @@ by game/evennia.py). import sys import os -# add core Evennia directory -sys.path.insert(1, os.path.dirname(os.path.dirname(os.path.dirname( - os.path.dirname(os.path.abspath(__file__)))))) -sys.path.insert(1, os.getcwd()) - from twisted.application import internet, service from twisted.internet import protocol, reactor from twisted.web import server diff --git a/evennia/server/server.py b/evennia/server/server.py index b6b174e638..e82fd44044 100644 --- a/evennia/server/server.py +++ b/evennia/server/server.py @@ -11,10 +11,6 @@ import time import sys import os -# add core Evennia directory -sys.path.insert(1, os.path.dirname(os.path.dirname( - os.path.dirname(os.path.abspath(__file__))))) - from twisted.web import server, static from twisted.application import internet, service from twisted.internet import reactor, defer