From 6938636ba2f1105ff75e98ebc7c8deac99df3e15 Mon Sep 17 00:00:00 2001 From: Maran Date: Thu, 11 Apr 2013 22:06:55 +0200 Subject: [PATCH 1/2] Changed the way the portable flag uses without supplying a -w argument --- electrum | 2 ++ 1 file changed, 2 insertions(+) diff --git a/electrum b/electrum index b9612555..d543116d 100755 --- a/electrum +++ b/electrum @@ -88,6 +88,8 @@ if __name__ == '__main__': parser = arg_parser() options, args = parser.parse_args() + if options.portable and options.wallet_path is None: + options.wallet_path = os.path.dirname(os.path.realpath(__file__)) + '/electrum.dat' set_verbosity(options.verbose) # config is an object passed to the various constructors (wallet, interface, gui) From 3fc059f6d16027fed95f36e6a3bee8eb4e2f83d5 Mon Sep 17 00:00:00 2001 From: Maran Date: Thu, 11 Apr 2013 22:08:27 +0200 Subject: [PATCH 2/2] Small windows build changes --- contrib/build-wine/deterministic.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec index 13af6a91..4c7e43a9 100644 --- a/contrib/build-wine/deterministic.spec +++ b/contrib/build-wine/deterministic.spec @@ -43,14 +43,15 @@ a.datas += extra_datas('plugins') pyz = PYZ(a.pure) exe = EXE(pyz, a.scripts, - exclude_binaries=1, + a.binaries, + a.datas, name=os.path.join('build\\pyi.win32\\electrum', 'electrum.exe'), debug=False, strip=None, upx=False, icon='icons/electrum.ico', - console=True) - # The console True makes an annoying black box pop up, but it does make Electrum accept command line options. + console=False) + # The console True makes an annoying black box pop up, but it does make Electrum output command line commands, with this turned off no output will be given but commands can still be used coll = COLLECT(exe, a.binaries, @@ -60,5 +61,5 @@ coll = COLLECT(exe, upx=True, debug=False, icon='icons/electrum.ico', - console=True, + console=False, name=os.path.join('dist', 'electrum'))