-#!/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
+cd ${a_dir}
-# 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
+if [ "$#" = 1 ]; then
+ export SALOME_PORT="$1"
+elif [ -z ${SALOME_PORT} ]; then
+ export SALOME_PORT=2900
+fi
-${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/envSalome.py"
-${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/runSalome.py"
+echo "Run SALOME on port ${SALOME_PORT}"
+
+source ${a_dir}/env.sh
+source ${a_dir}/env_salome.sh
+
+set -x +e
+
+${a_dir}/salome_kill.sh
+
+${KERNEL_ROOT_DIR}/bin/salome/runSalome.py --port=${SALOME_PORT} -r ./test.squish/shared/testdata/SalomeApp.xml 2>&1 >/dev/null
