takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #329 from ixjlyons/shell-env-prefer 

Prefer $SHELL over login shell.
This commit is contained in:
Daniel Micay 2016-04-09 03:42:41 -04:00
parent 2a87f8dd63 b219f171c9
commit ff93b3e28d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
termite.cc
View File

@ -1457,12 +1457,12 @@ static void exit_with_success(VteTerminal *) {
} }
static char *get_user_shell_with_fallback() { static char *get_user_shell_with_fallback() {
if (char *command = vte_get_user_shell())
return command;
if (const char *env = g_getenv("SHELL")) if (const char *env = g_getenv("SHELL"))
return g_strdup(env); return g_strdup(env);
if (char *command = vte_get_user_shell())
return command;
return g_strdup("/bin/sh"); return g_strdup("/bin/sh");
} }