MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-03-20 01:28:56 +00:00
Code Issues Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Pablo Santiago Blum de Aguiar 2020-02-11 14:47:06 +01:00
parent d0edea1baa
commit 91ec02c0a3
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
thefuck/shells/fish.py
View File

@ -60,8 +60,7 @@ class Fish(Generic):
' env TF_SHELL=fish TF_ALIAS={0} PYTHONIOENCODING=utf-8' ' env TF_SHELL=fish TF_ALIAS={0} PYTHONIOENCODING=utf-8'
' thefuck $fucked_up_command {2} $argv | read -l unfucked_command\n' ' thefuck $fucked_up_command {2} $argv | read -l unfucked_command\n'
' if [ "$unfucked_command" != "" ]\n' ' if [ "$unfucked_command" != "" ]\n'
' commandline $unfucked_command\n' ' eval $unfucked_command\n{1}'
' commandline -f execute\n{1}'
' end\n' ' end\n'
'end').format(alias_name, alter_history, ARGUMENT_PLACEHOLDER) 'end').format(alias_name, alter_history, ARGUMENT_PLACEHOLDER)
@ -133,4 +132,8 @@ class Fish(Generic):
def edit_command(self, command): def edit_command(self, command):
"""Return the shell editable command""" """Return the shell editable command"""
return 'commandline -r "' + command + '"' return ' commandline -r "' + command + '"'
def commandline_wrap(self, command):
"""Return the commandline replace and execute commands"""
return u'commandline "{}";commandline -f execute'.format(command)

4
thefuck/shells/generic.py
View File

@ -160,3 +160,7 @@ class Generic(object):
path=path, path=path,
reload=reload, reload=reload,
can_configure_automatically=Path(path).expanduser().exists()) can_configure_automatically=Path(path).expanduser().exists())
def commandline_wrap(self, command):
"""Generic implementation of commandline wrapper"""
return command

6
thefuck/types.py
View File

@ -234,7 +234,7 @@ class CorrectedCommand(object):
""" """
if self.should_edit: if self.should_edit:
self.script = shell.edit_command(self.script) return shell.edit_command(self.script)
if settings.repeat: if settings.repeat:
repeat_fuck = '{} --repeat {}--force-command {}'.format( repeat_fuck = '{} --repeat {}--force-command {}'.format(
@ -242,8 +242,8 @@ class CorrectedCommand(object):
'--debug ' if settings.debug else '', '--debug ' if settings.debug else '',
shell.quote(self.script)) shell.quote(self.script))
return shell.or_(self.script, repeat_fuck) return shell.or_(self.script, repeat_fuck)
else:
return self.script return shell.commandline_wrap(self.script)
def edit(self): def edit(self):
self.should_edit = True self.should_edit = True