From 6a903406710d9969e551e69eb43ae1a9e2f930e3 Mon Sep 17 00:00:00 2001 From: MMGen Date: Thu, 28 Feb 2019 10:51:27 +0000 Subject: [PATCH] minor changes --- mmgen/util.py | 8 +++++--- scripts/deinstall.sh | 9 --------- 2 files changed, 5 insertions(+), 12 deletions(-) delete mode 100755 scripts/deinstall.sh diff --git a/mmgen/util.py b/mmgen/util.py index fed2e95c..28627262 100755 --- a/mmgen/util.py +++ b/mmgen/util.py @@ -39,6 +39,8 @@ def ymsg(s): msg(yellow(s)) def ymsg_r(s): msg_r(yellow(s)) def gmsg(s): msg(green(s)) def gmsg_r(s): msg_r(green(s)) +def bmsg(s): msg(blue(s)) +def bmsg_r(s): msg_r(blue(s)) def mmsg(*args): for d in args: Msg(repr(d)) @@ -161,7 +163,7 @@ def dmsg(s): if opt.debug: msg(s) def suf(arg,suf_type='s'): - suf_types = { 's': ('s',''), 'es': ('es','') } + suf_types = { 's': ('s',''), 'es': ('es',''), 'y': ('ies','y') } assert suf_type in suf_types t = type(arg) if t == int: @@ -752,12 +754,12 @@ def my_raw_input(prompt,echo=True,insert_txt='',use_readline=True): except: die(1,'User input must be UTF-8 encoded.') -def keypress_confirm(prompt,default_yes=False,verbose=False,no_nl=False): +def keypress_confirm(prompt,default_yes=False,verbose=False,no_nl=False,complete_prompt=False): from mmgen.term import get_char q = ('(y/N)','(Y/n)')[bool(default_yes)] - p = '{} {}: '.format(prompt,q) + p = prompt if complete_prompt else '{} {}: '.format(prompt,q) nl = ('\n','\r{}\r'.format(' '*len(p)))[no_nl] if opt.accept_defaults: diff --git a/scripts/deinstall.sh b/scripts/deinstall.sh deleted file mode 100755 index 3f5e9823..00000000 --- a/scripts/deinstall.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -CMD='rm -rf /usr/local/share/mmgen /usr/local/bin/mmgen-* /usr/local/lib/python2.7/dist-packages/mmgen* /mingw/opt/bin/mmgen-* /mingw/opt/lib/python2.7/site-packages/mmgen*' - -if [ "$EUID" = 0 -o "$HOMEPATH" ]; then - set -x; $CMD -else - set -x; sudo $CMD -fi