Merge branch 'master' into simplify-shells

.travis.yml

@@ -17,8 +17,9 @@ addons:
       - pandoc
       - git
 install:
-  - pip install coveralls
-  - pip install -r requirements.txt
+  - pip install -U pip
+  - pip install -U coveralls
+  - pip install -Ur requirements.txt
   - python setup.py develop
   - rm -rf build
 script:

thefuck/rules/sudo.py

@@ -14,6 +14,7 @@ patterns = ['permission denied',
             'must be root',
             'need to be root',
             'need root',
+            'needs to be run as root',
             'only root can ',
             'You don\'t have access to the history DB.',
             'authentication is required',

thefuck/shells/fish.py

@@ -65,4 +65,5 @@ class Fish(Generic):
         return u'; and '.join(commands)
 
     def how_to_configure(self):
-        return 'eval thefuck --alias', '~/.config/fish/config.fish'
+        return (r"eval (thefuck --alias | tr '\n' ';')",
+                '~/.config/fish/config.fish')