X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=salome_kill.sh;h=3ae83e85a605eadbdc4065085346ae17ec1088b3;hb=dc31f8675dba96df59f15d4dca3ab11e7f95051f;hp=82360215bbf144ffeebf98bc0393c8e54e0d6bf2;hpb=a66a1008a2d33e0abb45b5f3fb350a6af8432e6f;p=modules%2Fshaper.git

diff --git a/salome_kill.sh b/salome_kill.sh
index 82360215b..3ae83e85a 100755
--- a/salome_kill.sh
+++ b/salome_kill.sh
@@ -1,13 +1,13 @@
-#!/bin/sh
+#!/bin/bash -e
 
-export ROOT_DIR=$(pwd)/..
-export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
+a_dir=$(dirname $0)
 
-source ${ROOT_DIR}/sources/linux_env.sh
+source ${a_dir}/env.sh
 
-# Correcting path which defined with error
-export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
-export SalomeAppConfig=${ROOT_DIR}/install/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui
+set +e -x
 
-${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/envSalome.py"
-${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/killSalome.py"
+${KERNEL_ROOT_DIR}/bin/salome/killSalome.py
+killall SALOME_LauncherServer
+killall SALOME_Session_Server
+killall SALOME_ConnectionManagerServer
+killall omniNames