Tune environment to the new SALOME behavior (it changes HOME to the current directory...

diff --git a/env.sh b/env.sh
index f42749e9e3e030f87369e0f54dbd924790c494ed..5c8cdb8a5ab25ae8a085823b8dae52da9306e7fd 100644 (file)
--- 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 da38262f1e5b9ba7cb913e724539a44b4dd92b45..dcbb707ceb93079b9d4aaabce511c874d0bc2731 100755 (executable)
--- 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}"