X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=salome_run.sh;h=8feb27cac881deaa6b8c23b1fcdf268edc6aeb81;hb=6967e5c6b1993581cc0711ec4c95bb01f74224b7;hp=4eba166fb4876bdea07a02ff40f0987bfce246ed;hpb=adc891685d4c8f06b2b540b642cabab8dc3314b0;p=modules%2Fshaper.git

diff --git a/salome_run.sh b/salome_run.sh
index 4eba166fb..8feb27cac 100755
--- a/salome_run.sh
+++ b/salome_run.sh
@@ -1,17 +1,28 @@
 #!/bin/bash
 
-export ROOT_DIR=$(pwd)/..
-export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
+source env.sh
+source ${TOOLS_DIR}/env_salome.sh
 
-source ${ROOT_DIR}/sources/salome_env.sh
-source ${ROOT_DIR}/sources/linux_env.sh $1
+${TOOLS_DIR}/solver.sh "$@"
 
-INSTALL_DIR=install
-if [ $1 ]; then INSTALL_DIR=${INSTALL_DIR}-$1; fi
+# kill processes of previous SALOME run
+if [ -f .salomeport ]; then
+  SALOME_PORT=$(cat .salomeport)
+  ${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
+  pkill -f "omniNames -start ${SALOME_PORT}"
+  rm .salomeport
+fi 
 
-# 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
+SALOME_ARGS=""
+if [[ "${SALOME_SQUISH_PREFS:-FALSE}" == "TRUE" ]]; then
+  SALOME_ARGS="${SALOME_ARGS} -r ${SOURCES_DIR}/test.squish/shared/testdata/SalomeApp.xml"
+fi
+SALOME_ARGS="${SALOME_ARGS} --ns-port-log=$(pwd)/.salomeport"
+
+${KERNEL_ROOT_DIR}/bin/salome/runSalome.py ${SALOME_ARGS} >log_runSalome 2>err_runSalome
+
+SALOME_PORT=$(cat .salomeport)
+echo "Kill SALOME on port ${SALOME_PORT}"
+${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py ${SALOME_PORT}
+pkill -f "omniNames -start ${SALOME_PORT}"
 
-${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/envSalome.py"
-${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/runSalome.py" noexcepthandler