AaronFiore/electrum
1
0
Fork 0
Code Activity

rename contrib/build-osx as contrib/osx. Move QRReader submodule there.

Browse Source
This commit is contained in:
ThomasV
2018-11-29 11:39:57 +01:00
parent db89286ec3
commit d7bf8826fc
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/qrscanner.py
View File

@@ -73,9 +73,9 @@ def scan_barcode_osx(*args_ignored, **kwargs_ignored):
import subprocess
# NOTE: This code needs to be modified if the positions of this file changes with respect to the helper app!
# This assumes the built macOS .app bundle which ends up putting the helper app in
# .app/contrib/CalinsQRReader/build/Release/CalinsQRReader.app.
# .app/contrib/osx/CalinsQRReader/build/Release/CalinsQRReader.app.
root_ec_dir = os.path.abspath(os.path.dirname(__file__) + "/../")
prog = root_ec_dir + "/" + "contrib/CalinsQRReader/build/Release/CalinsQRReader.app/Contents/MacOS/CalinsQRReader"
prog = root_ec_dir + "/" + "contrib/osx/CalinsQRReader/build/Release/CalinsQRReader.app/Contents/MacOS/CalinsQRReader"
if not os.path.exists(prog):
raise RuntimeError("Cannot start QR scanner; helper app not found.")
data = ''