Chris Mendis
692ee53a33
I discovered that a common shell script issue (https://github.com/koalaman/shellcheck/wiki/SC2155) is present in the script returned by `Zsh.app_alias()`, amongst other `app_alias` methods in thefuck. In the case of the zsh `app_alias()` script, this common issue is causing the script to error on some versions of Mac OS X. This is reported in #718. Unmasking the value of `TF_SHELL_ALIASES` fixes the errors in Mac OS X, but I also unmasked `TF_HISTORY` for consistency.
88 lines
3.1 KiB
Python
88 lines
3.1 KiB
Python
from time import time
|
|
import os
|
|
from tempfile import gettempdir
|
|
from uuid import uuid4
|
|
from ..conf import settings
|
|
from ..const import ARGUMENT_PLACEHOLDER, USER_COMMAND_MARK
|
|
from ..utils import memoize
|
|
from .generic import Generic
|
|
|
|
|
|
class Zsh(Generic):
|
|
def app_alias(self, alias_name):
|
|
# It is VERY important to have the variables declared WITHIN the function
|
|
return '''
|
|
{name} () {{
|
|
TF_PYTHONIOENCODING=$PYTHONIOENCODING;
|
|
export TF_SHELL=zsh;
|
|
export TF_ALIAS={name};
|
|
TF_SHELL_ALIASES=$(alias);
|
|
export TF_SHELL_ALIASES;
|
|
TF_HISTORY="$(fc -ln -10)";
|
|
export TF_HISTORY;
|
|
export PYTHONIOENCODING=utf-8;
|
|
TF_CMD=$(
|
|
thefuck {argument_placeholder} $@
|
|
) && eval $TF_CMD;
|
|
unset TF_HISTORY;
|
|
export PYTHONIOENCODING=$TF_PYTHONIOENCODING;
|
|
{alter_history}
|
|
}}
|
|
'''.format(
|
|
name=alias_name,
|
|
argument_placeholder=ARGUMENT_PLACEHOLDER,
|
|
alter_history=('test -n "$TF_CMD" && print -s $TF_CMD'
|
|
if settings.alter_history else ''))
|
|
|
|
def instant_mode_alias(self, alias_name):
|
|
if os.environ.get('THEFUCK_INSTANT_MODE', '').lower() == 'true':
|
|
mark = ('%{' +
|
|
USER_COMMAND_MARK + '\b' * len(USER_COMMAND_MARK)
|
|
+ '%}')
|
|
return '''
|
|
export PS1="{user_command_mark}$PS1";
|
|
{app_alias}
|
|
'''.format(user_command_mark=mark,
|
|
app_alias=self.app_alias(alias_name))
|
|
else:
|
|
log_path = os.path.join(
|
|
gettempdir(), 'thefuck-script-log-{}'.format(uuid4().hex))
|
|
return '''
|
|
export THEFUCK_INSTANT_MODE=True;
|
|
export THEFUCK_OUTPUT_LOG={log};
|
|
thefuck --shell-logger {log};
|
|
rm {log};
|
|
exit
|
|
'''.format(log=log_path)
|
|
|
|
def _parse_alias(self, alias):
|
|
name, value = alias.split('=', 1)
|
|
if value[0] == value[-1] == '"' or value[0] == value[-1] == "'":
|
|
value = value[1:-1]
|
|
return name, value
|
|
|
|
@memoize
|
|
def get_aliases(self):
|
|
raw_aliases = os.environ.get('TF_SHELL_ALIASES', '').split('\n')
|
|
return dict(self._parse_alias(alias)
|
|
for alias in raw_aliases if alias and '=' in alias)
|
|
|
|
def _get_history_file_name(self):
|
|
return os.environ.get("HISTFILE",
|
|
os.path.expanduser('~/.zsh_history'))
|
|
|
|
def _get_history_line(self, command_script):
|
|
return u': {}:0;{}\n'.format(int(time()), command_script)
|
|
|
|
def _script_from_history(self, line):
|
|
if ';' in line:
|
|
return line.split(';', 1)[1]
|
|
else:
|
|
return ''
|
|
|
|
def how_to_configure(self):
|
|
return self._create_shell_configuration(
|
|
content=u'eval $(thefuck --alias)',
|
|
path='~/.zshrc',
|
|
reload='source ~/.zshrc')
|