aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2007-06-09 17:44:27 (GMT)
committermathias <mathias>2007-06-09 17:44:27 (GMT)
commit6f8a5c7a8dc4552105205c8c9f0d270703bcc271 (patch)
tree4ba221d8ff113a7a60c58e538f504fdcab331110
parent222d8cd7e9c0f28b3dd0b9b253a0b096d856195f (diff)
downloadfluxbox_paul-6f8a5c7a8dc4552105205c8c9f0d270703bcc271.zip
fluxbox_paul-6f8a5c7a8dc4552105205c8c9f0d270703bcc271.tar.bz2
small fix for the /bin/sh issue .. just using /bin/zsh now
-rw-r--r--ChangeLog4
-rw-r--r--src/FbCommands.cc4
-rw-r--r--util/fbrun/FbRun.cc4
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 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3*07/06/09:
4 * Minor change to the /bin/sh - solution (Mathias)
5 we are using now just $SHELL -c <line_here>
6 src/FbCommands.cc util/fbrun/FbRun.cc
3*07/06/08: 7*07/06/08:
4 * Fix transient windows getting tabbed from apps file and not changing layers 8 * Fix transient windows getting tabbed from apps file and not changing layers
5 when main window is in a lowered tab (Mark) 9 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() {
155 displaystring.erase(displaystring.size()-1); 155 displaystring.erase(displaystring.size()-1);
156 displaystring += intbuff; 156 displaystring += intbuff;
157 157
158 std::string exec_cmd = "exec " + m_cmd;
159
160 setsid(); 158 setsid();
161 putenv(const_cast<char *>(displaystring.c_str())); 159 putenv(const_cast<char *>(displaystring.c_str()));
162 execl(shell, shell, "-c", exec_cmd.c_str(), static_cast<void*>(NULL)); 160 execl(shell, shell, "-c", m_cmd.c_str(), static_cast<void*>(NULL));
163 exit(0); 161 exit(0);
164 162
165 return pid; // compiler happy -> we are happy ;) 163 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) {
124 if (!shell) 124 if (!shell)
125 shell = "/bin/sh"; 125 shell = "/bin/sh";
126 126
127 std::string exec_cmd = "exec " + command;
128
129 setsid(); 127 setsid();
130 execl(shell, shell, "-c", exec_cmd.c_str(), static_cast<void*>(NULL)); 128 execl(shell, shell, "-c", command.c_str(), static_cast<void*>(NULL));
131 exit(0); //exit child 129 exit(0); //exit child
132 } 130 }
133 131