X-Git-Url: https://git.novaco.in/?p=electrum-nvc.git;a=blobdiff_plain;f=electrum;fp=electrum;h=97f66d75e6c67ad9f1ab9951d71aa5b0f357c9b0;hp=1e4acec36aa1c80fda88466f49021f74a007d997;hb=3cbe11a42473af52e7c5e002c36aaaf32646f627;hpb=068609b4a65a172a15a24299b8a0fad0ef82898c

diff --git a/electrum b/electrum
index 1e4acec..97f66d7 100755
--- a/electrum
+++ b/electrum
@@ -36,15 +36,15 @@ __builtin__.use_local_modules = is_local or is_android
 # load local module as electrum
 if __builtin__.use_local_modules:
     import imp
-    imp.load_module('electrum', *imp.find_module('lib'))
-    imp.load_module('electrum_gui', *imp.find_module('gui'))
+    imp.load_module('electrum_nvc', *imp.find_module('lib'))
+    imp.load_module('electrum_nvc_gui', *imp.find_module('gui'))
 
 if is_local:
     sys.path.append('packages')
 
 
-from electrum import SimpleConfig, Network, Wallet, WalletStorage, NetworkProxy, Commands, known_commands, pick_random_server
-from electrum.util import print_msg, print_stderr, print_json, set_verbosity
+from electrum_nvc import SimpleConfig, Network, Wallet, WalletStorage, NetworkProxy, Commands, known_commands, pick_random_server
+from electrum_nvc.util import print_msg, print_stderr, print_json, set_verbosity
 
 # get password routine
 def prompt_password(prompt, confirm=True):
@@ -67,7 +67,7 @@ def arg_parser():
     parser = optparse.OptionParser(usage=usage, add_help_option=False)
     parser.add_option("-h", "--help", action="callback", callback=print_help_cb, help="show this help text")
     parser.add_option("-g", "--gui", dest="gui", help="User interface: qt, lite, gtk, text or stdio")
-    parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum.dat)")
+    parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum-nvc.dat)")
     parser.add_option("-o", "--offline", action="store_true", dest="offline", default=False, help="remain offline")
     parser.add_option("-C", "--concealed", action="store_true", dest="concealed", default=False, help="don't echo seed to console when restoring")
     parser.add_option("-a", "--all", action="store_true", dest="show_all", default=False, help="show all addresses")
@@ -93,8 +93,8 @@ def arg_parser():
 
 def print_help(parser):
     parser.print_help()
-    print_msg("Type 'electrum help <command>' to see the help for a specific command")
-    print_msg("Type 'electrum --help' to see the list of options")
+    print_msg("Type 'electrum-nvc help <command>' to see the help for a specific command")
+    print_msg("Type 'electrum-nvc --help' to see the list of options")
     run_command(known_commands['help'])
 
 
@@ -151,7 +151,7 @@ if __name__ == '__main__':
     parser = arg_parser()
     options, args = parser.parse_args()
     if options.portable and options.wallet_path is None:
-        options.electrum_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data')
+        options.electrum_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum-nvc_data')
 
     # config is an object passed to the various constructors (wallet, interface, gui)
     if is_android:
@@ -174,7 +174,7 @@ if __name__ == '__main__':
     if len(args) == 0:
         url = None
         cmd = 'gui'
-    elif len(args) == 1 and re.match('^bitcoin:', args[0]):
+    elif len(args) == 1 and re.match('^novacoin:', args[0]):
         url = args[0]
         cmd = 'gui'
     else:
@@ -185,7 +185,7 @@ if __name__ == '__main__':
         if gui_name in ['lite', 'classic']:
             gui_name = 'qt'
         try:
-            gui = __import__('electrum_gui.' + gui_name, fromlist=['electrum_gui'])
+            gui = __import__('electrum_nvc_gui.' + gui_name, fromlist=['electrum_nvc_gui'])
         except ImportError:
             traceback.print_exc(file=sys.stdout)
             sys.exit()
@@ -293,7 +293,7 @@ if __name__ == '__main__':
 
     if cmd.name not in ['create', 'restore'] and cmd.requires_wallet and not storage.file_exists:
         print_msg("Error: Wallet file not found.")
-        print_msg("Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option")
+        print_msg("Type 'electrum-nvc create' to create a new wallet, or provide a path to a wallet with the -w option")
         sys.exit(0)