fix for portable version: use its own directory

diff --git a/electrum b/electrum
index e06b2b6..eae7687 100755 (executable)
--- 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
index a57747d..e3614f5 100644 (file)
--- 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: