Merge pull request #329 from ixjlyons/shell-env-prefer
Prefer $SHELL over login shell.
This commit is contained in:
commit
ff93b3e28d
|
@ -1457,12 +1457,12 @@ static void exit_with_success(VteTerminal *) {
|
|||
}
|
||||
|
||||
static char *get_user_shell_with_fallback() {
|
||||
if (char *command = vte_get_user_shell())
|
||||
return command;
|
||||
|
||||
if (const char *env = g_getenv("SHELL"))
|
||||
return g_strdup(env);
|
||||
|
||||
if (char *command = vte_get_user_shell())
|
||||
return command;
|
||||
|
||||
return g_strdup("/bin/sh");
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue