Merge branch 'master' of github.com:nvbn/thefuck

This commit is contained in:
nvbn
2015-07-10 17:58:53 +03:00
4 changed files with 13 additions and 5 deletions
+2 -1
View File
@@ -13,7 +13,8 @@ patterns = ['permission denied',
'must be root',
'need to be root',
'need root',
'only root can do that']
'only root can do that',
'authentication is required']
def match(command, settings):
+8 -2
View File
@@ -1,3 +1,4 @@
from thefuck.utils import get_closest
import re
@@ -8,7 +9,12 @@ def match(command, settings):
def get_new_command(command, settings):
cmd = re.match(r"ambiguous command: (.*), could be: ([^, \n]*)",
cmd = re.match(r"ambiguous command: (.*), could be: (.*)",
command.stderr)
return command.script.replace(cmd.group(1), cmd.group(2))
old_cmd = cmd.group(1)
suggestions = [cmd.strip() for cmd in cmd.group(2).split(',')]
new_cmd = get_closest(old_cmd, suggestions)
return command.script.replace(old_cmd, new_cmd)