MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-10-31 07:04:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #431 from nvbn/428-readonly-history

Browse Source 
#428: Don't fail when history is readonly
This commit is contained in:
Vladimir Iakovlev
2016-01-13 22:03:31 +03:00
parent 8b05f6d46f d53240b777
commit 6e22b9ec6c
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
thefuck/shells.py
View File

@@ -10,13 +10,14 @@ from time import time
import io import io
import os import os
import shlex import shlex
import sys
import six import six
from .utils import DEVNULL, memoize, cache from .utils import DEVNULL, memoize, cache
from .conf import settings from .conf import settings
from . import logs
class Generic(object): class Generic(object):
def get_aliases(self): def get_aliases(self):
return {} return {}
@@ -69,8 +70,8 @@ class Generic(object):
lines = lines[-settings.history_limit:] lines = lines[-settings.history_limit:]
for line in lines: for line in lines:
prepared = self._script_from_history(line)\ prepared = self._script_from_history(line) \
.strip() .strip()
if prepared: if prepared:
yield prepared yield prepared
@@ -117,9 +118,9 @@ class Bash(Generic):
def get_aliases(self): def get_aliases(self):
proc = Popen(['bash', '-ic', 'alias'], stdout=PIPE, stderr=DEVNULL) proc = Popen(['bash', '-ic', 'alias'], stdout=PIPE, stderr=DEVNULL)
return dict( return dict(
self._parse_alias(alias) self._parse_alias(alias)
for alias in proc.stdout.read().decode('utf-8').split('\n') for alias in proc.stdout.read().decode('utf-8').split('\n')
if alias and '=' in alias) if alias and '=' in alias)
def _get_history_file_name(self): def _get_history_file_name(self):
return os.environ.get("HISTFILE", return os.environ.get("HISTFILE",
@@ -139,7 +140,6 @@ class Bash(Generic):
class Fish(Generic): class Fish(Generic):
def _get_overridden_aliases(self): def _get_overridden_aliases(self):
overridden_aliases = os.environ.get('TF_OVERRIDDEN_ALIASES', '').strip() overridden_aliases = os.environ.get('TF_OVERRIDDEN_ALIASES', '').strip()
if overridden_aliases: if overridden_aliases:
@@ -219,9 +219,9 @@ class Zsh(Generic):
def get_aliases(self): def get_aliases(self):
proc = Popen(['zsh', '-ic', 'alias'], stdout=PIPE, stderr=DEVNULL) proc = Popen(['zsh', '-ic', 'alias'], stdout=PIPE, stderr=DEVNULL)
return dict( return dict(
self._parse_alias(alias) self._parse_alias(alias)
for alias in proc.stdout.read().decode('utf-8').split('\n') for alias in proc.stdout.read().decode('utf-8').split('\n')
if alias and '=' in alias) if alias and '=' in alias)
def _get_history_file_name(self): def _get_history_file_name(self):
return os.environ.get("HISTFILE", return os.environ.get("HISTFILE",
@@ -254,9 +254,9 @@ class Tcsh(Generic):
def get_aliases(self): def get_aliases(self):
proc = Popen(['tcsh', '-ic', 'alias'], stdout=PIPE, stderr=DEVNULL) proc = Popen(['tcsh', '-ic', 'alias'], stdout=PIPE, stderr=DEVNULL)
return dict( return dict(
self._parse_alias(alias) self._parse_alias(alias)
for alias in proc.stdout.read().decode('utf-8').split('\n') for alias in proc.stdout.read().decode('utf-8').split('\n')
if alias and '\t' in alias) if alias and '\t' in alias)
def _get_history_file_name(self): def _get_history_file_name(self):
return os.environ.get("HISTFILE", return os.environ.get("HISTFILE",
@@ -303,7 +303,10 @@ def thefuck_alias():
def put_to_history(command): def put_to_history(command):
return _get_shell().put_to_history(command) try:
return _get_shell().put_to_history(command)
except IOError:
logs.exception("Can't update history", sys.exc_info())
def and_(*commands): def and_(*commands):