PR: bug when calling killSalome from shell

diff --git a/bin/killSalome.py b/bin/killSalome.py
index 828c354ae52b7c2b73a3e07cfb99280e5bccad7e..96e923980773f150248c9f98a6363f9b44742cc9 100755 (executable)
--- a/bin/killSalome.py
+++ b/bin/killSalome.py
@@ -13,5 +13,5 @@ def killAllPorts():
                     killMyPort(l[len(l)-3])
         pass
 
-if sys.argv[0] == "killSalome.py":
+if __name__ == "__main__":
     killAllPorts()

diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py
index 3b364f9559c81509ce3c670f745b58adea38302c..7c8dcd2ed1800c80f269142caef2488c702616c4 100755 (executable)
--- a/bin/killSalomeWithPort.py
+++ b/bin/killSalomeWithPort.py
@@ -36,6 +36,6 @@ def killMyPort(port):
             pid = commands.getoutput("ps -eo pid,command | egrep \"[0-9] omniNames -start "+str(port)+"\" | sed -e \"s%[^0-9]*\([0-9]*\) .*%\\1%g\"")
               
 
-if sys.argv[0] == "killSalomeWithPort.py":
+if __name__ == "__main__":
     for port in sys.argv[1:]:
         killMyPort(port)

diff --git a/bin/runSalome b/bin/runSalome
index 37f6614e25a0f51ae86b3680d06f15b20473b43b..9577ea58ebdb5fa1206d5c39a33d9715426e3acf 100755 (executable)
--- a/bin/runSalome
+++ b/bin/runSalome
@@ -32,7 +32,7 @@ fi
 #  
 #  $: ${KERNEL_ROOT_DIR}/bin/salome/runSalome --modules=GEOM,SMESH,VISU,SUPERV,MED --embedded=registry,study,moduleCatalog,cppContainer --standalone=pyContainer,supervContainer --xterm --killall
 #
-#     parameter from command line supersedes thoses from $HOME/.salome/salome.launch
+#     parameters from command line supersede those from $HOME/.salome/salome.launch
 #
 # Some CORBA servers could be launched in the SALOME_Session_Server
 # (embedded = same process) or in a separate process (standalone):