fix: pass cwd with config_options
This commit is contained in:
parent
9a454b60ce
commit
73822e8ec2
3
electrum
3
electrum
|
@ -286,7 +286,6 @@ if __name__ == '__main__':
|
|||
'verbose': True,
|
||||
'cmd': 'gui',
|
||||
'gui': 'kivy',
|
||||
#'auto_connect': True,
|
||||
}
|
||||
else:
|
||||
config_options = args.__dict__
|
||||
|
@ -296,6 +295,8 @@ if __name__ == '__main__':
|
|||
if config_options.get('server'):
|
||||
config_options['auto_connect'] = False
|
||||
|
||||
config_options['cwd'] = os.getcwd()
|
||||
|
||||
if config_options.get('portable'):
|
||||
config_options['electrum_path'] = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data')
|
||||
|
||||
|
|
|
@ -139,9 +139,8 @@ class SimpleConfig(PrintError):
|
|||
"""Set the path of the wallet."""
|
||||
|
||||
# command line -w option
|
||||
path = self.get('wallet_path')
|
||||
if path:
|
||||
return path
|
||||
if self.get('wallet_path'):
|
||||
return os.path.join(self.get('cwd'), self.get('wallet_path'))
|
||||
|
||||
# path in config file
|
||||
path = self.get('default_wallet_path')
|
||||
|
|
Loading…
Reference in New Issue