X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=salome_run.sh;h=dcbb707ceb93079b9d4aaabce511c874d0bc2731;hb=08203d89ebbd4b7d85b6fdfe6075cb4bfa9dc0d3;hp=ae238852a7c7cc8560662d2eafd431675fc57dbe;hpb=8a0e84a23452aa1b25b56056ce3e3ca225b806ec;p=modules%2Fshaper.git

diff --git a/salome_run.sh b/salome_run.sh
index ae238852a..dcbb707ce 100755
--- a/salome_run.sh
+++ b/salome_run.sh
@@ -1,20 +1,27 @@
-#!/bin/bash -e
+#!/bin/bash
 
-a_dir=$(dirname $0)
+source env.sh
 
-if [ "$#" = 1 ]; then
-  export SALOME_PORT="$1"
-elif [ -z ${SALOME_PORT} ]; then
-  export SALOME_PORT=2900
-fi
+${TOOLS_DIR}/solver.sh "$@"
 
-echo "Run SALOME on port ${SALOME_PORT}"
+# 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 
 
-source ${a_dir}/env.sh
-source ${a_dir}/env_salome.sh
+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"
 
-set -x +e
+${KERNEL_ROOT_DIR}/bin/salome/runSalome.py ${SALOME_ARGS} >log_runSalome 2>err_runSalome
 
-${a_dir}/salome_kill.sh
+#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}"
 
-${KERNEL_ROOT_DIR}/bin/salome/runSalome.py --port=${SALOME_PORT} -r ./test.squish/shared/testdata/SalomeApp.xml 2>&1 >/dev/null