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

improving shell detection

This commit is contained in:
kohlerm 2017-03-31 13:47:07 +00:00
parent 5610a384b8
commit af11439bd5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
termite.cc
View File

@ -1480,11 +1480,17 @@ static void exit_with_success(VteTerminal *) {
} }
static char *get_user_shell_with_fallback() { static char *get_user_shell_with_fallback() {
if (const char *env = g_getenv("SHELL")) if (const char *env = g_getenv("SHELL") )
return g_strdup(env); {
if (!((env != NULL) && (env[0] == '\0')))
return g_strdup(env);
}
if (char *command = vte_get_user_shell()) if (char *command = vte_get_user_shell())
return command; {
if (!((command != NULL) && (command[0] == '\0')))
return command;
}
return g_strdup("/bin/sh"); return g_strdup("/bin/sh");
} }