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

Merge pull request #470 from kohlerm/master 

improving shell detection
This commit is contained in:
jelle van der Waa 2017-07-08 21:37:29 +02:00 committed by GitHub
parent d7d90e47c9 340a1613bb
commit d87e7c8269
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
termite.cc
View File

@ -1519,11 +1519,15 @@ 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");
} }