Merge branch 'master' into gni/evolution

[modules/shaper.git] / salome_run.sh

diff --git a/salome_run.sh b/salome_run.sh
index 5984410f1559f4ca1ab2cdc8c47478241e860ef3..dcbb707ceb93079b9d4aaabce511c874d0bc2731 100755 (executable)
--- a/salome_run.sh
+++ b/salome_run.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 source env.sh
-source ${TOOLS_DIR}/env_salome.sh
+
+${TOOLS_DIR}/solver.sh "$@"
 
 # kill processes of previous SALOME run
 if [ -f .salomeport ]; then
@@ -19,8 +20,8 @@ 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}"
+#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}"