From 8136b022bc9a35c3f16d40b225f650250d243816 Mon Sep 17 00:00:00 2001 From: mailchuck Date: Sun, 13 Dec 2015 22:18:31 +0100 Subject: [PATCH] Typos Still regarding portable mode path fixes --- src/helper_startup.py | 2 +- src/shared.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/helper_startup.py b/src/helper_startup.py index 11671481..a194a574 100644 --- a/src/helper_startup.py +++ b/src/helper_startup.py @@ -35,7 +35,7 @@ def loadConfig(): needToCreateKeysFile = True else: - shared.config.read(shared.lookupExeFolder() + 'keys.dat')) + shared.config.read(shared.lookupExeFolder() + 'keys.dat') try: shared.config.get('bitmessagesettings', 'settingsversion') print 'Loading config files from same directory as program.' diff --git a/src/shared.py b/src/shared.py index 77b81322..944cb659 100644 --- a/src/shared.py +++ b/src/shared.py @@ -200,9 +200,9 @@ def assembleErrorMessage(fatal=0, banTime=0, inventoryVector='', errorText=''): def lookupExeFolder(): if frozen: - exeFolder = os.path.join(os.path.dirname(sys.executable), '/') - elif __file__: - exeFolder = os.path.join(os.path.dirname(__file__), '/') + exeFolder = path.dirname(sys.executable) + path.sep + elif __file__: + exeFolder = path.dirname(__file__) + path.sep else: exeFolder = '' return exeFolder