1
0
mirror of https://github.com/nvbn/thefuck.git synced 2025-01-31 10:11:14 +00:00

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

This commit is contained in:
nvbn 2015-04-22 23:36:43 +02:00
commit 2e652112ff
3 changed files with 9 additions and 2 deletions

View File

@ -106,6 +106,12 @@ If it fails try to use `easy_install`:
sudo easy_install thefuck sudo easy_install thefuck
``` ```
Or using an OS package manager (currently supported in OSX via [brew](http://brew.sh)):
```bash
brew install thefuck
```
And add to `.bashrc` or `.zshrc` or `.bash_profile`(for OSX): And add to `.bashrc` or `.zshrc` or `.bash_profile`(for OSX):
```bash ```bash
@ -175,7 +181,7 @@ and `get_new_command(command: Command, settings: Settings) -> str`.
`Command` has three attributes: `script`, `stdout` and `stderr`. `Command` has three attributes: `script`, `stdout` and `stderr`.
`Settings` is `~/.thefuck/settings.py`. `Settings` is a special object filled with `~/.thefuck/settings.py` and values from env, [more](#settings).
Simple example of the rule for running script with `sudo`: Simple example of the rule for running script with `sudo`:

View File

@ -4,6 +4,7 @@ from thefuck.rules.rm_dir import match, get_new_command
def test_match(): def test_match():
assert match(Command('rm foo', '', 'rm: foo: is a directory'), None) assert match(Command('rm foo', '', 'rm: foo: is a directory'), None)
assert match(Command('rm foo', '', 'rm: foo: Is a directory'), None)
assert not match(Command('rm foo', '', ''), None) assert not match(Command('rm foo', '', ''), None)
assert not match(Command('rm foo', '', 'foo bar baz'), None) assert not match(Command('rm foo', '', 'foo bar baz'), None)
assert not match(Command('', '', ''), None) assert not match(Command('', '', ''), None)

View File

@ -5,7 +5,7 @@ from thefuck.utils import sudo_support
@sudo_support @sudo_support
def match(command, settings): def match(command, settings):
return ('rm' in command.script return ('rm' in command.script
and 'is a directory' in command.stderr) and 'is a directory' in command.stderr.lower())
@sudo_support @sudo_support