#253: Update default overridden aliases with user's

2016-04-06 22:58:08 -03:00
parent 183b70c8b8
commit db6053b301
2 changed files with 14 additions and 12 deletions
@@ -7,11 +7,10 @@ from .generic import Generic

 class Fish(Generic):
    def _get_overridden_aliases(self):
-        overridden_aliases = os.environ.get('TF_OVERRIDDEN_ALIASES', '').strip()
-        if overridden_aliases:
-            return [alias.strip() for alias in overridden_aliases.split(',')]
-        else:
-            return ['cd', 'grep', 'ls', 'man', 'open']
+        default = {'cd', 'grep', 'ls', 'man', 'open'}
+        for alias in os.environ.get('TF_OVERRIDDEN_ALIASES', '').split(','):
+            default.add(alias.strip())
+        return default

    def app_alias(self, fuck):
        # It is VERY important to have the variables declared WITHIN the alias