tMake where() work with OSX app bundles - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit fd8a931608d3676cf7220dc955b41b7b95dbc14b
DIR parent 2bf32880e85cb092e55f4c42be2aea872e4d2b0e
HTML Author: Maran <maran.hidskes@gmail.com>
Date: Tue, 27 Jan 2015 12:22:28 +0100
Make where() work with OSX app bundles
MEIPASS is PythonInstaller specific and won't work for py2app
modified: lib/util.py
modified: .gitignore
modified: lib/util.py
modified: setup-release.py
Diffstat:
M .gitignore | 1 +
M lib/util.py | 9 +++++++--
M setup-release.py | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
---
DIR diff --git a/.gitignore b/.gitignore
t@@ -13,3 +13,4 @@ gui/qt/icons_rc.py
locale/
.devlocaltmp/
*_trial_temp
+packages
DIR diff --git a/lib/util.py b/lib/util.py
t@@ -66,8 +66,13 @@ def data_dir():
if __builtin__.use_local_modules:
return local_data_dir()
else:
- if getattr(sys, 'frozen'):
- basedir = sys._MEIPASS
+ is_frozen = getattr(sys, 'frozen')
+ if is_frozen:
+ if is_frozen == "macosx_app":
+ basedir = os.path.abspath(".")
+ else:
+ basedir = sys._MEIPASS
+
return os.path.join(basedir, 'data')
else:
return appdata_dir()
DIR diff --git a/setup-release.py b/setup-release.py
t@@ -37,7 +37,7 @@ if sys.platform == 'darwin':
app=[mainscript],
options=dict(py2app=dict(argv_emulation=True,
includes=['PyQt4.QtCore', 'PyQt4.QtGui', 'PyQt4.QtWebKit', 'PyQt4.QtNetwork', 'sip'],
- packages=['lib', 'gui', 'plugins'],
+ packages=['lib', 'gui', 'plugins', 'packages'],
iconfile='electrum.icns',
plist=plist,
resources=["data", "icons"])),