Merge branch 'Dev_1.4.0' of newgeom:newgeom into Dev_1.4.0

[modules/shaper.git] / salome_kill.sh

diff --git a/salome_kill.sh b/salome_kill.sh
old mode 100644 (file)
new mode 100755 (executable)
index 8236021..da53b60
--- a/salome_kill.sh
+++ b/salome_kill.sh
@@ -1,13 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
-export ROOT_DIR=$(pwd)/..
-export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
+source env.sh
+source env_salome.sh
 
-source ${ROOT_DIR}/sources/linux_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
-
-${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/envSalome.py"
-${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/killSalome.py"
+#${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/killSalome.py"
+${KERNEL_ROOT_DIR}/bin/salome/killSalome.py