summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@gnugeneration.com>2014-09-28 17:34:22 -0700
committerVito Caputo <vcaputo@gnugeneration.com>2014-09-28 17:34:22 -0700
commita12c562bb5811b9f51b324746ff7c482197e7222 (patch)
tree891e2fc148f51ba801b7e760df1b31ab83a1023d
parent7bcde781975ddf4a5ce266a9214ba26f563ed063 (diff)
Switched launchers to execute via "/bin/sh" rather than "bash"
Using bash was a bit heavy-handed when all I really want is a /bin/sh -c just like popen()/system(). On some systems this won't make any difference, but on Debian /bin/sh -> dash.
-rw-r--r--vwm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vwm.c b/vwm.c
index 0d18832..e290952 100644
--- a/vwm.c
+++ b/vwm.c
@@ -2453,7 +2453,7 @@ static void vwm_keypressed(Window win, XEvent *keypress)
static typeof(keypress->xkey.state) last_state;
static int repeat_cnt = 0;
int do_grab = 0;
- char *quit_console_args[] = {"bash", "-c", "screen -dr " CONSOLE_SESSION_STRING " -X quit", NULL};
+ char *quit_console_args[] = {"/bin/sh", "-c", "screen -dr " CONSOLE_SESSION_STRING " -X quit", NULL};
sym = XLookupKeysym(&keypress->xkey, 0);
@@ -2469,7 +2469,7 @@ static void vwm_keypressed(Window win, XEvent *keypress)
#define launcher(_sym, _label, _argv)\
case _sym: \
{ \
- char *args[] = {"bash", "-c", "screen -dr " CONSOLE_SESSION_STRING " -X screen bash -i -x -c \"" _argv " || sleep 86400\"", NULL};\
+ char *args[] = {"/bin/sh", "-c", "screen -dr " CONSOLE_SESSION_STRING " -X screen /bin/sh -i -x -c \"" _argv " || sleep 86400\"", NULL};\
vwm_launch(args, VWM_LAUNCH_MODE_BG);\
break; \
}
@@ -2783,7 +2783,7 @@ int main(int argc, char *argv[])
XEvent event;
Cursor pointer;
struct pollfd pfd;
- char *console_args[] = {"xterm", "-class", CONSOLE_WM_CLASS, "-e", "bash", "-c", "screen -D -RR " CONSOLE_SESSION_STRING, NULL};
+ char *console_args[] = {"xterm", "-class", CONSOLE_WM_CLASS, "-e", "/bin/sh", "-c", "screen -D -RR " CONSOLE_SESSION_STRING, NULL};
Window bitmask;
vwm_clickety_t clickety = { .vwin = NULL };
© All Rights Reserved