X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=salome_kill.sh;h=3fe6b6f18f57ad2dc99e1f857ea8fdf11471d714;hb=fc88c49ff45f48d63ff6067384e56eb146c4cbc0;hp=da9b7eec65e60fce005205000ee21b696d58f9ad;hpb=adc891685d4c8f06b2b540b642cabab8dc3314b0;p=modules%2Fshaper.git

diff --git a/salome_kill.sh b/salome_kill.sh
index da9b7eec6..3fe6b6f18 100755
--- a/salome_kill.sh
+++ b/salome_kill.sh
@@ -1,17 +1,14 @@
-#!/bin/bash
+#!/bin/bash -e
 
-export ROOT_DIR=$(pwd)/..
-export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
+a_dir=$(dirname $0)
 
-source ${ROOT_DIR}/sources/salome_env.sh
-source ${ROOT_DIR}/sources/linux_env.sh
+source ${a_dir}/env.sh
+source ${a_dir}/env_salome.sh
 
-INSTALL_DIR=install
-if [ $1 ]; then INSTALL_DIR=${INSTALL_DIR}-$1; fi
+set +e -x
 
-# Correcting path which defined with error
-export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
-export SalomeAppConfig=${ROOT_DIR}/${INSTALL_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui
-
-${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