From f14ff0f10e10a6daf673d19090dd1afc72cee768 Mon Sep 17 00:00:00 2001 From: Nedko Arnaudov Date: Sun, 2 Oct 2011 16:03:20 +0300 Subject: [PATCH] ladishd: when starting apps, always use shell. Fix #179 terminal emulators expect split commandline. without terminal emulator and without shell, commandline must be split. --- daemon/loader.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/daemon/loader.c b/daemon/loader.c index c0ee708f..777d7cb4 100644 --- a/daemon/loader.c +++ b/daemon/loader.c @@ -324,16 +324,13 @@ loader_exec_program( argv[i++] = "-e"; } - if (!run_in_terminal || strchr(commandline, '$') != NULL) + if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i)) { - if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i)) - { - argv[i] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT; - } - i++; - - argv[i++] = "-c"; + argv[i] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT; } + i++; + + argv[i++] = "-c"; argv[i++] = commandline; argv[i++] = NULL;