Skip to content

fix: use shell-agnostic 'and' operator in sudo rule instead of hardcoded '&&' #1604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rahul-COD3 wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −2
Open

fix: use shell-agnostic 'and' operator in sudo rule instead of hardcoded '&&' #1604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions thefuck/rules/sudo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
from thefuck.shells import shell

_and_operator = shell.and_('', '').strip()

patterns = ['permission denied',
'eacces',
'pkg: insufficient privileges',
Expand Down Expand Up @@ -29,7 +33,7 @@


def match(command):
if command.script_parts and '&&' not in command.script_parts and command.script_parts[0] == 'sudo':
if command.script_parts and _and_operator not in command.script and command.script_parts[0] == 'sudo':
return False

for pattern in patterns:
Expand All @@ -39,7 +43,7 @@ def match(command):


def get_new_command(command):
if '&&' in command.script:
if _and_operator in command.script:
return u'sudo sh -c "{}"'.format(" ".join([part for part in command.script_parts if part != "sudo"]))
elif '>' in command.script:
return u'sudo sh -c "{}"'.format(command.script.replace('"', '\\"'))
Expand Down