From: dmv <dmv@opencascade.com>
Date: Wed, 8 Sep 2010 15:20:58 +0000 (+0000)
Subject: IPAL21912  WinTC5.1.4: kill_salome.bat doesn't kill Salome
X-Git-Tag: V5_1_5a1~23
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FBR_WIN_INDUS;p=modules%2Fkernel.git

IPAL21912  WinTC5.1.4: kill_salome.bat doesn't kill Salome
---

diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py
index 4e1cbbd4f..38e0cf710 100755
--- a/bin/killSalomeWithPort.py
+++ b/bin/killSalomeWithPort.py
@@ -146,7 +146,12 @@ def killMyPort(port):
         fpid = open(filedict, 'r')
         #
         from salome_utils import generateFileName
-        fpidomniNames = generateFileName(os.path.join('/tmp/logs', os.getenv('USER')),
+	if sys.platform == "win32":
+            username = os.getenv( "USERNAME" )
+	else:
+            username = os.getenv('USER')
+        path = os.path.join('/tmp/logs', username)
+        fpidomniNames = generateFileName(path,
                                          prefix="",
                                          suffix="Pid_omniNames",
                                          extension="log",