AaronFiore/electrum
1
0
Fork 0
Code Activity

fix for portable version: use its own directory

Browse Source
This commit is contained in:
ThomasV
2013-11-05 23:02:51 +01:00
parent 325efed9ac
commit f340f08a6e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum
View File

@@ -118,7 +118,7 @@ if __name__ == '__main__':
parser = arg_parser() parser = arg_parser()
options, args = parser.parse_args() options, args = parser.parse_args()
if options.portable and options.wallet_path is None: if options.portable and options.wallet_path is None:
options.wallet_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum.dat') options.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) # config is an object passed to the various constructors (wallet, interface, gui)
if is_android: if is_android:

11
lib/simple_config.py
View File

@@ -22,6 +22,9 @@ a SimpleConfig instance then reads the wallet file.
if options.get('portable') is not True: if options.get('portable') is not True:
self.read_system_config() self.read_system_config()
# command-line options
self.options_config = options
# init path # init path
self.init_path() self.init_path()
@@ -30,16 +33,18 @@ a SimpleConfig instance then reads the wallet file.
if options.get('portable') == False: if options.get('portable') == False:
self.read_user_config() self.read_user_config()
# command-line options
self.options_config = options
def init_path(self): def init_path(self):
# Read electrum path in the command line configuration
self.path = self.options_config.get('electrum_path')
# Read electrum path in the system configuration # Read electrum path in the system configuration
self.path = self.system_config.get('electrum_path') if self.path is None:
self.path = self.system_config.get('electrum_path')
# If not set, use the user's default data directory. # If not set, use the user's default data directory.
if self.path is None: if self.path is None: