|
@@ -229,21 +229,17 @@ if invoked_as == 'passchg' and ss_in.infile.dirname == g.data_dir:
|
|
|
shred_file(
|
|
|
ss_in.infile.name,
|
|
|
verbose = opt.verbose )
|
|
|
+elif (
|
|
|
+ invoked_as == 'gen'
|
|
|
+ and not opt.outdir
|
|
|
+ and not opt.stdout
|
|
|
+ and not find_file_in_dir( MMGenWallet, g.data_dir )
|
|
|
+ and keypress_confirm(
|
|
|
+ 'Make this wallet your default and move it to the data directory?',
|
|
|
+ default_yes = True ) ):
|
|
|
+ ss_out.write_to_file(outdir=g.data_dir)
|
|
|
else:
|
|
|
- try:
|
|
|
- assert invoked_as == 'gen', 'dw'
|
|
|
- assert not opt.outdir, 'dw'
|
|
|
- assert not opt.stdout, 'dw'
|
|
|
- assert not find_file_in_dir( MMGenWallet, g.data_dir ), 'dw'
|
|
|
- assert keypress_confirm(
|
|
|
- 'Make this wallet your default and move it to the data directory?',
|
|
|
- default_yes = True ), 'dw'
|
|
|
- except Exception as e:
|
|
|
- if str(e) != 'dw':
|
|
|
- raise
|
|
|
- ss_out.write_to_file()
|
|
|
- else:
|
|
|
- ss_out.write_to_file(outdir=g.data_dir)
|
|
|
+ ss_out.write_to_file()
|
|
|
|
|
|
if invoked_as == 'passchg':
|
|
|
if ss_out.ssdata.passwd == ss_in.ssdata.passwd:
|