Salome HOME
Added unit-test that checks the issue #1379 is fixed
[modules/shaper.git] / env.sh
diff --git a/env.sh b/env.sh
index ab13dd393f00b5fb2ab37f0d2cae70c79df7ea19..a1de6f2e2b369b0e92874ec372cb6b0d6744a688 100644 (file)
--- a/env.sh
+++ b/env.sh
@@ -3,21 +3,21 @@
 # Path to sources
 export SOURCES_DIR=$(pwd)
 # Path to build directory
-export BUILD_DIR=$(cd .. && pwd)/build
+export BUILD_DIR=$(cd ${SOURCES_DIR}/.. && pwd)/build
 # Path to linux_run.sh & salome_run.sh
 export AUT_DIR=$(pwd)
 
 # Path to env_*.sh files
 export TOOLS_DIR=$(pwd)
 
-# Extracts INST_ROOT directory for SALOME
-if [[ ! -f env_config.sh ]]; then
-  echo "Can not find env_config.sh. Please, run config.sh."
-  exit 1
-fi
-source env_config.sh
+export HOME_OLD=$HOME
+source /dn46/SALOME/series8x/current-2018-05-30/start.sh
+export HOME=$HOME_OLD
 
 # Path to solvespace-2
-export NEWGEOM_PDIR=/dn48/newgeom/common/products
+export SHAPER_PDIR=/dn48/newgeom/common/products
 # Path to install directory
-export NEWGEOM_ROOT_DIR=$(cd .. && pwd)/install
+export SHAPER_ROOT_DIR=$(cd ${SOURCES_DIR}/.. && pwd)/install
+
+source ${TOOLS_DIR}/env_linux.sh
+source ${TOOLS_DIR}/env_salome.sh