wok rev 20659
sakura: fix login shell (again)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Jan 13 21:29:34 2019 +0100 (2019-01-13) |
parents | bb52d6e358fb |
children | 73a636bdc14e |
files | sakura/receipt sakura/stuff/login_shell.patch |
line diff
1.1 --- a/sakura/receipt Sun Jan 13 20:57:08 2019 +0100 1.2 +++ b/sakura/receipt Sun Jan 13 21:29:34 2019 +0100 1.3 @@ -26,6 +26,7 @@ 1.4 patch -p1 -i $stuff/sakura-icon.patch 1.5 patch -p1 -i $stuff/ru.po.patch 1.6 patch -p1 -i $stuff/fr.po.patch 1.7 + patch -p1 -i $stuff/login_shell.patch 1.8 1.9 cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE . && 1.10 sed -i 's/$/ -lncurses/' CMakeFiles/sakura.dir/link.txt &&
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/sakura/stuff/login_shell.patch Sun Jan 13 21:29:34 2019 +0100 2.3 @@ -0,0 +1,28 @@ 2.4 +--- a/src/sakura.c 2.5 ++++ b/src/sakura.c 2.6 +@@ -196,7 +196,7 @@ 2.7 + gint scrollbar_key; 2.8 + gint fullscreen_key; 2.9 + GRegex *http_regexp; 2.10 +- char *argv[2]; 2.11 ++ char *argv[3]; 2.12 + } sakura; 2.13 + 2.14 + struct terminal { 2.15 +@@ -1825,12 +1825,13 @@ 2.16 + } 2.17 + 2.18 + /* Set argv for forked childs */ 2.19 ++ sakura.argv[0]=g_strdup(g_getenv("SHELL")); 2.20 + if (option_login) { 2.21 +- sakura.argv[0]=g_strdup_printf("-%s", g_getenv("SHELL")); 2.22 ++ sakura.argv[1]=g_strdup("-l"); 2.23 + } else { 2.24 +- sakura.argv[0]=g_strdup(g_getenv("SHELL")); 2.25 ++ sakura.argv[1]=NULL; 2.26 + } 2.27 +- sakura.argv[1]=NULL; 2.28 ++ sakura.argv[2]=NULL; 2.29 + 2.30 + if (option_title) { 2.31 + gtk_window_set_title(GTK_WINDOW(sakura.main_window), option_title);