fix -P option
This commit is contained in:
parent
6201133c48
commit
701527df20
6
electrum
6
electrum
|
@ -402,9 +402,6 @@ if __name__ == '__main__':
|
|||
parser = get_parser(run_gui, run_daemon, run_cmdline)
|
||||
args = parser.parse_args()
|
||||
|
||||
if args.portable and args.wallet_path is None:
|
||||
args.electrum_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data')
|
||||
|
||||
# config is an object passed to the various constructors (wallet, interface, gui)
|
||||
if is_android:
|
||||
config_options = {
|
||||
|
@ -421,6 +418,9 @@ if __name__ == '__main__':
|
|||
if config_options.get('server'):
|
||||
config_options['auto_connect'] = False
|
||||
|
||||
if config_options.get('portable') and config_options.get('wallet_path') is None:
|
||||
config_options['electrum_path'] = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data')
|
||||
|
||||
set_verbosity(config_options.get('verbose'))
|
||||
config = SimpleConfig(config_options)
|
||||
|
||||
|
|
|
@ -173,7 +173,7 @@ def get_parser(run_gui, run_daemon, run_cmdline):
|
|||
add_offline_option(parser_gui)
|
||||
add_wallet_options(parser_gui)
|
||||
# daemon
|
||||
parser_daemon = subparsers.add_parser('daemon', help="Run Daemon")
|
||||
parser_daemon = subparsers.add_parser('daemon', parents=[parent_parser, conn_parser], help="Run Daemon")
|
||||
parser_daemon.add_argument("subcommand", choices=['start', 'status', 'stop'])
|
||||
parser_daemon.set_defaults(func=run_daemon)
|
||||
# create a parser for each command
|
||||
|
|
Loading…
Reference in New Issue