electrum

commit f340f08a6e5c524d48faab2300faaacf049d87cc
parent 325efed9ac6ccf2cec8df62655c5a44a14dccc6e
Author: ThomasV <thomasv@gitorious>
Date:   Tue,  5 Nov 2013 23:02:51 +0100

fix for portable version: use its own directory

Diffstat:
M
electrum
 | 
2
+-
M
lib/simple_config.py
 | 
11
++++++++---

2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/electrum b/electrum
@@ -118,7 +118,7 @@ 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.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)
     if is_android:
diff --git a/lib/simple_config.py b/lib/simple_config.py
@@ -22,6 +22,9 @@ a SimpleConfig instance then reads the wallet file.
         if options.get('portable') is not True:
             self.read_system_config()
 
+        # command-line options
+        self.options_config = options
+
         # init path
         self.init_path()
 
@@ -30,16 +33,18 @@ a SimpleConfig instance then reads the wallet file.
         if options.get('portable') == False:
             self.read_user_config()
 
-        # command-line options
-        self.options_config = options
 
 
 
 
     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
-        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 self.path is None: