LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-03 12:30:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: pass cwd with config_options

Browse source
This commit is contained in:
ThomasV 2016-02-24 16:57:58 +01:00
parent 9a454b60ce
commit 73822e8ec2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
electrum
View file

@ -286,7 +286,6 @@ if __name__ == '__main__':
'verbose': True, 'verbose': True,
'cmd': 'gui', 'cmd': 'gui',
'gui': 'kivy', 'gui': 'kivy',
#'auto_connect': True,
} }
else: else:
config_options = args.__dict__ config_options = args.__dict__
@ -296,6 +295,8 @@ if __name__ == '__main__':
if config_options.get('server'): if config_options.get('server'):
config_options['auto_connect'] = False config_options['auto_connect'] = False
config_options['cwd'] = os.getcwd()
if config_options.get('portable'): if config_options.get('portable'):
config_options['electrum_path'] = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data') config_options['electrum_path'] = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data')

5
lib/simple_config.py
View file

@ -139,9 +139,8 @@ class SimpleConfig(PrintError):
"""Set the path of the wallet.""" """Set the path of the wallet."""
# command line -w option # command line -w option
path = self.get('wallet_path') if self.get('wallet_path'):
if path: return os.path.join(self.get('cwd'), self.get('wallet_path'))
return path
# path in config file # path in config file
path = self.get('default_wallet_path') path = self.get('default_wallet_path')