g.keywords added

mmgen/globalvars.py

@@ -45,6 +45,7 @@ class g(object):
 	author    = 'Philemon'
 	email     = '<mmgen@tuta.io>'
 	Cdates    = '2013-2016'
+	keywords  = 'Bitcoin, cryptocurrency, wallet, cold storage, offline, online, spending, open-source, command-line, Python, Bitcoin Core, bitcoind, hd, deterministic, hierarchical, secure, anonymous, Electrum, seed, mnemonic, brainwallet, Scrypt, utility, script, scriptable, blockchain, raw, transaction, permissionless, console, terminal, curses, ansi, color, tmux, remote, client, daemon, RPC, json, entropy, xterm, rxvt, PowerShell, MSYS, MinGW, mswin'
 
 	user_entropy   = ''
 	hash_preset    = '3'

mmgen/share/Opts.py

@@ -91,7 +91,7 @@ def parse_opts(argv,opts_data,opt_filter=None):
 	pat = r'^-([a-zA-Z0-9-]), --([a-zA-Z0-9-]{2,64})(=| )(.+)'
 	od_all = []
 
-	for k in ('options','long_options'):
+	for k in ['options'] + ([],['long_options'])['long_options' in opts_data]:
 		od,skip = [],True
 		for l in opts_data[k].strip().splitlines():
 			m = re.match(pat,l)

mmgen/util.py

@@ -39,6 +39,17 @@ def mdie(*args):
 		sys.stdout.write(repr(d)+'\n')
 	sys.exit()
 
+def die_wait(delay,ev=0,s=''):
+	assert type(delay) == int
+	assert type(ev) == int
+	if s: sys.stderr.write(s+'\n')
+	time.sleep(delay)
+	sys.exit(ev)
+def die_pause(ev=0,s=''):
+	assert type(ev) == int
+	if s: sys.stderr.write(s+'\n')
+	raw_input('Press ENTER to exit')
+	sys.exit(ev)
 def die(ev=0,s=''):
 	assert type(ev) == int
 	if s: sys.stderr.write(s+'\n')

setup.py

@@ -64,7 +64,7 @@ setup(
 		url          = g.proj_url,
 		license      = 'GNU GPL v3',
 		platforms    = 'Linux, MS Windows, Raspberry Pi',
-		keywords     = 'Bitcoin, cryptocurrency, wallet, cold storage, offline, online, spending, open-source, command-line, Python, Bitcoin Core, bitcoind, hd, deterministic, hierarchical, secure, anonymous, Electrum, seed, mnemonic, brainwallet, Scrypt, utility, script, scriptable, blockchain, raw, transaction, permissionless, console, terminal, curses, ansi, color, tmux, remote, client, daemon, RPC, json, entropy, xterm, rxvt, PowerShell, MSYS, MinGW, mswin',
+		keywords     = g.keywords,
 		cmdclass     = { 'build_ext': my_build_ext, 'install_data': my_install_data },
 		ext_modules = [module1],
 		data_files = [('share/mmgen', [