mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 10:04:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2742_csh_as_tcsh_fix'

Browse Source
This commit is contained in:
Yury V. Zaytsev 2016-04-25 21:44:15 +02:00
commit 23c00cf33f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/shell.c
View File

@ -76,6 +76,8 @@ mc_shell_get_installed_in_system (void)
mc_shell->path = g_strdup ("/bin/zsh"); mc_shell->path = g_strdup ("/bin/zsh");
else if (access ("/bin/tcsh", X_OK) == 0) else if (access ("/bin/tcsh", X_OK) == 0)
mc_shell->path = g_strdup ("/bin/tcsh"); mc_shell->path = g_strdup ("/bin/tcsh");
else if (access ("/bin/csh", X_OK) == 0)
mc_shell->path = g_strdup ("/bin/csh");
/* No fish as fallback because it is so much different from other shells and /* No fish as fallback because it is so much different from other shells and
* in a way exotic (even though user-friendly by name) that we should not * in a way exotic (even though user-friendly by name) that we should not
* present it as a subshell without the user's explicit intention. We rather * present it as a subshell without the user's explicit intention. We rather
@ -154,6 +156,12 @@ mc_shell_recognize_real_path (mc_shell_t * mc_shell)
mc_shell->type = SHELL_TCSH; mc_shell->type = SHELL_TCSH;
mc_shell->name = "tcsh"; mc_shell->name = "tcsh";
} }
else if (strstr (mc_shell->path, "/csh") != NULL
|| strstr (mc_shell->real_path, "/csh") != NULL)
{
mc_shell->type = SHELL_TCSH;
mc_shell->name = "csh";
}
else if (strstr (mc_shell->path, "/fish") != NULL else if (strstr (mc_shell->path, "/fish") != NULL
|| strstr (mc_shell->real_path, "/fish") != NULL) || strstr (mc_shell->real_path, "/fish") != NULL)
{ {