mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

terminal: run $SHELL if set

Browse Source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2012-02-03 20:58:19 +10:00
committed by Kristian Høgsberg
parent 3bd6917199
commit 035ac94c17
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/terminal.c
+6 -1
View File
@@ -2372,6 +2372,7 @@ int main(int argc, char *argv[])
{ {
struct display *d; struct display *d;
struct terminal *terminal; struct terminal *terminal;
const char *shell;
d = display_create(&argc, &argv, option_entries); d = display_create(&argc, &argv, option_entries);
if (d == NULL) { if (d == NULL) {
@@ -2379,8 +2380,12 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
shell = getenv("SHELL");
if (!shell)
shell = "/bin/bash";
terminal = terminal_create(d, option_fullscreen); terminal = terminal_create(d, option_fullscreen);
if (terminal_run(terminal, "/bin/bash")) if (terminal_run(terminal, shell))
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
display_run(d); display_run(d);