From c7d0a6a4794f10a73d8c2cb103aa1c33c1b7ce69 Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@arnaudov.name>
Date: Thu, 18 Nov 2010 02:26:56 +0200
Subject: [PATCH] ladishd: the reset of the previous commit

---
 daemon/loader.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/daemon/loader.c b/daemon/loader.c
index 354eb0ce..cdee3299 100644
--- a/daemon/loader.c
+++ b/daemon/loader.c
@@ -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;