electrum

commit ba19e5a12dc559ed9eb02e986f373c1a102ac12e
parent 9c144c11ef0e5cccd152d4ffe436dfc236a280da
Author: ThomasV <thomasv1@gmx.de>
Date:   Wed, 25 Dec 2013 01:43:35 -0800

Merge pull request #510 from tessus/master

fix #454, README update, minor setup-release.py change
Diffstat:
M
README
 | 
2
+-
M
setup-release.py
 | 
8
++++++--

2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/README b/README
@@ -26,7 +26,7 @@ https://en.bitcoin.it/wiki/Electrum
 == HOW OFFICIAL PACKAGES ARE CREATED ==
 
 python mki18n.py
-pyrcc4 icons.qrc -o gui/icons_rc.py
+pyrcc4 icons.qrc -o gui/qt/icons_rc.py
 python setup.py sdist --format=zip,gztar
 
 On Mac OS X:
diff --git a/setup-release.py b/setup-release.py
@@ -35,7 +35,7 @@ if sys.platform == 'darwin':
     extra_options = dict(
         setup_requires=['py2app'],
         app=[mainscript],
-        options=dict(py2app=dict(argv_emulation=False,
+        options=dict(py2app=dict(argv_emulation=True,
                                  includes=['PyQt4.QtCore', 'PyQt4.QtGui', 'sip'],
                                  packages=['lib', 'gui', 'plugins'],
                                  iconfile='electrum.icns',
@@ -73,7 +73,11 @@ if sys.platform == 'darwin':
         qt_menu_location = "/opt/local/lib/Resources/qt_menu.nib"
     else:
         # No dice? Then let's try the brew version
-        qt_menu_location = os.popen("find /usr/local/Cellar -name qt_menu.nib | tail -n 1").read()
+        if os.path.exists("/usr/local/Cellar"):
+            qt_menu_location = os.popen("find /usr/local/Cellar -name qt_menu.nib | tail -n 1").read()
+        # no brew, check /opt/local
+        else:
+            qt_menu_location = os.popen("find /opt/local -name qt_menu.nib | tail -n 1").read()
         qt_menu_location = re.sub('\n', '', qt_menu_location)
 
     if (len(qt_menu_location) == 0):