From 6f8a5c7a8dc4552105205c8c9f0d270703bcc271 Mon Sep 17 00:00:00 2001
From: mathias <mathias>
Date: Sat, 9 Jun 2007 17:44:27 +0000
Subject: small fix for the /bin/sh issue .. just using /bin/zsh now

---
 ChangeLog           | 4 ++++
 src/FbCommands.cc   | 4 +---
 util/fbrun/FbRun.cc | 4 +---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a638414..3fe485e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
  (Format: Year/Month/Day)
 Changes for 1.0.0:
+*07/06/09:
+   * Minor change to the /bin/sh - solution (Mathias)
+     we are using now just $SHELL -c <line_here>
+     src/FbCommands.cc util/fbrun/FbRun.cc
 *07/06/08:
    * Fix transient windows getting tabbed from apps file and not changing layers
      when main window is in a lowered tab (Mark)
diff --git a/src/FbCommands.cc b/src/FbCommands.cc
index 4247820..9becb8e 100644
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@@ -155,11 +155,9 @@ int ExecuteCmd::run() {
     displaystring.erase(displaystring.size()-1);
     displaystring += intbuff;
 
-    std::string exec_cmd = "exec " + m_cmd;
-
     setsid();
     putenv(const_cast<char *>(displaystring.c_str()));
-    execl(shell, shell, "-c", exec_cmd.c_str(), static_cast<void*>(NULL));
+    execl(shell, shell, "-c", m_cmd.c_str(), static_cast<void*>(NULL));
     exit(0);
 
     return pid; // compiler happy -> we are happy ;)
diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc
index 95cb94d..908b3c2 100644
--- a/util/fbrun/FbRun.cc
+++ b/util/fbrun/FbRun.cc
@@ -124,10 +124,8 @@ void FbRun::run(const std::string &command) {
         if (!shell)
             shell = "/bin/sh";
 
-        std::string exec_cmd = "exec " + command;
-
         setsid();
-        execl(shell, shell, "-c", exec_cmd.c_str(), static_cast<void*>(NULL));
+        execl(shell, shell, "-c", command.c_str(), static_cast<void*>(NULL));
         exit(0); //exit child
     }
 
-- 
cgit v0.11.2