Changeset f14ff0f10e10a6daf673d19090dd1afc72cee768

Timestamp:

10/02/11 16:03:26 (20 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

9908fe7a0d7be7fc2b0bb6917db329b6017ae1cd

Parents:

17e02f89a3ea1a9f9679ec7921909cc40c2d70f8

git-author:

Nedko Arnaudov <nedko@arnaudov.name> / 2011-10-02T16:03:20Z+0300

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2011-10-02T16:03:26Z+0300

Message:

ladishd: when starting apps, always use shell. Fix #179

terminal emulators expect split commandline.
without terminal emulator and without shell, commandline must be split.

Files:

• daemon/loader.c (modified) (1 diff)

daemon/loader.c

@@ -325 +325 @@
   }
 
-  if (!run_in_terminal || strchr(commandline, '$') != NULL)
-  {
-    if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i))
-    {
-      argv[i] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT;
-    }
-    i++;
-
-    argv[i++] = "-c";
-  }
+  if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i))
+  {
+    argv[i] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT;
+  }
+  i++;
+
+  argv[i++] = "-c";
 
   argv[i++] = commandline;