V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Showing only changes of commit 6f74ffc265 - Show all commits

View File

@ -207,7 +207,11 @@ def assembleErrorMessage(fatal=0, banTime=0, inventoryVector='', errorText=''):
def lookupExeFolder(): def lookupExeFolder():
if frozen: if frozen:
exeFolder = path.dirname(sys.executable) + path.sep if frozen == "macosx_app":
# targetdir/Bitmessage.app/Contents/MacOS/Bitmessage
exeFolder = path.dirname(path.dirname(path.dirname(path.dirname(sys.executable)))) + path.sep
else:
exeFolder = path.dirname(sys.executable) + path.sep
elif __file__: elif __file__:
exeFolder = path.dirname(__file__) + path.sep exeFolder = path.dirname(__file__) + path.sep
else: else: