X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=env.sh;h=ab13dd393f00b5fb2ab37f0d2cae70c79df7ea19;hb=e8749ccc51bd96a90fdf01025a78fb6d0271d637;hp=6282b1a850555aae20f975d24a0d4ce62605a9d8;hpb=ae56a5ed7f640a944108b5aee567bb80ced86c9a;p=modules%2Fshaper.git

diff --git a/env.sh b/env.sh
index 6282b1a85..ab13dd393 100644
--- a/env.sh
+++ b/env.sh
@@ -1,22 +1,23 @@
 #!/bin/bash -x
 
-set -o nounset
+# Path to sources
+export SOURCES_DIR=$(pwd)
+# Path to build directory
+export BUILD_DIR=$(cd .. && pwd)/build
+# Path to linux_run.sh & salome_run.sh
+export AUT_DIR=$(pwd)
 
-PLATFORM=""
-if [ -f PLATFORM ]; then
-PLATFORM="$(lsb_release -is)"
-RELEASE="$(lsb_release -rs)"
-if [ "${PLATFORM}" = 'CentOS' ]; then PLATFORM=-centos
-elif [ "${PLATFORM}" = 'Debian' ]; then
-  if [ "${RELEASE}" = '8.0' ]; then PLATFORM=-d8
-  else PLATFORM=-d6
-  fi
-fi
-fi
+# Path to env_*.sh files
+export TOOLS_DIR=$(pwd)
 
-export ROOT_DIR=$(cd $(dirname $0)/.. && pwd)
-export SOURCES_DIR=${ROOT_DIR}/sources
-export BUILD_DIR=${ROOT_DIR}/build${PLATFORM}
-export INSTALL_DIR=${ROOT_DIR}/install${PLATFORM}
+# 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
 
+# Path to solvespace-2
 export NEWGEOM_PDIR=/dn48/newgeom/common/products
+# Path to install directory
+export NEWGEOM_ROOT_DIR=$(cd .. && pwd)/install