Author: gnodet
Date: Thu Sep 25 05:18:10 2008
New Revision: 698940
URL: http://svn.apache.org/viewvc?rev=698940&view=rev
Log:
Fix use of start directory when creating processes
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/unix/start.sh
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/windows/start.vbs
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/unix/start.sh
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/unix/start.sh?rev=698940&r1=698939&r2=698940&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/unix/start.sh
(original)
+++
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/unix/start.sh
Thu Sep 25 05:18:10 2008
@@ -3,6 +3,8 @@
#exec 2>${err.file}
exec 1>/dev/null
exec 2>/dev/null
-cd ${dir}
+if [ "x${dir}" != "x" ]; then
+ cd ${dir}
+fi
nohup ${command} &
echo $! > ${pid.file}
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/windows/start.vbs
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/windows/start.vbs?rev=698940&r1=698939&r2=698940&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/windows/start.vbs
(original)
+++
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/windows/start.vbs
Thu Sep 25 05:18:10 2008
@@ -2,7 +2,11 @@
Set objConfig = objWMIService.Get("Win32_ProcessStartup").SpawnInstance_
objConfig.ShowWindow = SW_HIDE
objConfig.CreateFlags = 8
-intReturn = objWMIService.Get("Win32_Process").Create("${command}", "${dir}",
objConfig, intProcessID)
+If StrLen("${dir}") > 0 Then
+ intReturn = objWMIService.Get("Win32_Process").Create("${command}",
"${dir}", objConfig, intProcessID)
+Else
+ intReturn = objWMIService.Get("Win32_Process").Create("${command}", Null,
objConfig, intProcessID)
+End If
If intReturn = 0 Then
Set objOutputFile =
CreateObject("Scripting.fileSystemObject").CreateTextFile("${pid.file}", TRUE)
objOutputFile.WriteLine(intProcessID)
