Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite error messages for incorrect TERM

Browse source 
(cherry picked from commit 0f3b4d2bd8)
This commit is contained in:
David Adam 2016-06-26 16:23:26 +08:00
parent 02f578a82d
commit a47b4b0e95
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/input.cpp
View file

@ -463,21 +463,22 @@ int input_init() {
int err_ret; int err_ret;
if (setupterm(NULL, STDOUT_FILENO, &err_ret) == ERR) { if (setupterm(NULL, STDOUT_FILENO, &err_ret) == ERR) {
debug(0, _(L"Could not set up terminal"));
env_var_t term = env_get_string(L"TERM"); env_var_t term = env_get_string(L"TERM");
if (term.missing_or_empty()) { if (term.missing_or_empty()) {
debug(0, _(L"Your TERM is unset or empty.")); debug(0, _(L"TERM environment variable not set"));
} else { } else {
debug(0, _(L"Your TERM value of '%ls' is not valid"), term.c_str()); debug(0, _(L"TERM environment variable set to '%ls'"), term.c_str());
debug(0, _(L"Check that your terminal type is supported on this system")); debug(0, _(L"Check that this terminal type is supported on this system"));
} }
env_set(L"TERM", DEFAULT_TERM, ENV_GLOBAL | ENV_EXPORT); env_set(L"TERM", DEFAULT_TERM, ENV_GLOBAL | ENV_EXPORT);
if (setupterm(NULL, STDOUT_FILENO, &err_ret) == ERR) { if (setupterm(NULL, STDOUT_FILENO, &err_ret) == ERR) {
debug(0, _(L"Unable to setup terminal using your TERM or the '%ls' fallback"), debug(0, _(L"Could not set up terminal using the fallback terminal type '%ls' - exiting"),
DEFAULT_TERM); DEFAULT_TERM);
exit_without_destructors(1); exit_without_destructors(1);
} else { } else {
debug(0, _(L"Using fallback terminal type '%ls' instead"), DEFAULT_TERM); debug(0, _(L"Using fallback terminal type '%ls'"), DEFAULT_TERM);
} }
} }