Merge branch 'po/29467_gui_log_file'

[modules/shaper.git] / salome_kill.sh

diff --git a/salome_kill.sh b/salome_kill.sh
index 18da44763fdeba42f1b6b8175410aa332cf814ca..3ae83e85a605eadbdc4065085346ae17ec1088b3 100755 (executable)
--- a/salome_kill.sh
+++ b/salome_kill.sh
@@ -1,11 +1,13 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 
-source env.sh
-source env_salome.sh
+a_dir=$(dirname $0)
+
+source ${a_dir}/env.sh
+
+set +e -x
 
 ${KERNEL_ROOT_DIR}/bin/salome/killSalome.py
-set +e
 killall SALOME_LauncherServer
 killall SALOME_Session_Server
 killall SALOME_ConnectionManagerServer
-set -e
+killall omniNames