From: mpv <mpv@opencascade.com>
Date: Thu, 1 Sep 2016 09:52:34 +0000 (+0300)
Subject: Tune environment to the new SALOME behavior (it changes HOME to the current directory... 
X-Git-Tag: V_2.5.0~88
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b297d2c427d389f99bbc8c6c2370382ce6823d16;p=modules%2Fshaper.git

Tune environment to the new SALOME behavior (it changes HOME to the current directory). So, if the current is not owner's (as GZY has), it will fail. Also it keeps the control, not exits from the script.
---

diff --git a/env.sh b/env.sh
index f42749e9e..5c8cdb8a5 100644
--- a/env.sh
+++ b/env.sh
@@ -10,7 +10,9 @@ export AUT_DIR=$(pwd)
 # Path to env_*.sh files
 export TOOLS_DIR=$(pwd)
 
+export HOME_OLD=$HOME
 source /dn64/series7x/work/init.sh 2016-06-20
+export HOME=$HOME_OLD
 
 # Path to solvespace-2
 export SHAPER_PDIR=/dn48/newgeom/common/products
diff --git a/salome_run.sh b/salome_run.sh
index da38262f1..dcbb707ce 100755
--- a/salome_run.sh
+++ b/salome_run.sh
@@ -20,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}"