LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ladishd: the reset of the previous commit

This commit is contained in:
Nedko Arnaudov 2010-11-18 02:26:56 +02:00
parent d027731b18
commit c7d0a6a479
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daemon/loader.c
View File

@ -306,13 +306,16 @@ loader_exec_program(
argv[i++] = "-e";
}
if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i))
if (!run_in_terminal || strchr(commandline, '$') != NULL)
{
argv[i] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT;
}
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++] = "-c";
}
argv[i++] = commandline;
argv[i++] = NULL;