From 74dab8d3f5baea0216f46e84e6f5af57df9f9a01 Mon Sep 17 00:00:00 2001
From: mzn <mzn@opencascade.com>
Date: Thu, 30 Aug 2018 14:26:09 +0300
Subject: [PATCH] Get rid of redundant definitions.

---
 env.sh        |  5 +++--
 env_linux.sh  | 31 ++-----------------------------
 env_salome.sh |  3 +--
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/env.sh b/env.sh
index 7091b84af..2edade92e 100644
--- a/env.sh
+++ b/env.sh
@@ -11,11 +11,12 @@ export AUT_DIR=$(pwd)
 export TOOLS_DIR=$(pwd)
 
 export HOME_OLD=$HOME
-source /dn46/SALOME/series9x/current-2018-08-22/start.sh
+source /dn46/SALOME/series9x/current-2018-08-30/start.sh
 export HOME=$HOME_OLD
 
-# Path to solvespace-2
+# Path to special products dir (lcov, cpplint)
 export SHAPER_PDIR=/dn48/newgeom/common/products
+
 # Path to install directory
 export SHAPER_ROOT_DIR=$(cd ${SOURCES_DIR}/.. && pwd)/install
 
diff --git a/env_linux.sh b/env_linux.sh
index 5beff47b4..d6cf38269 100644
--- a/env_linux.sh
+++ b/env_linux.sh
@@ -2,7 +2,7 @@
 
 # This script uses:
 #
-# SHAPER_PDIR - path of PRODUCTS for SHAPER (SolveSpace, lcov, cpplint)
+# SHAPER_PDIR - path of PRODUCTS for SHAPER (lcov, cpplint)
 # SHAPER_ROOT_DIR - path of SHAPER installation
 
 for path in SHAPER_PDIR SHAPER_ROOT_DIR; do
@@ -13,24 +13,6 @@ for path in SHAPER_PDIR SHAPER_ROOT_DIR; do
   fi
 done
 
-#------ SolveSpace ------
-export SOLVESPACE_ROOT_DIR=${SHAPER_PDIR}/solvespace-2.1
-export LD_LIBRARY_PATH=${SOLVESPACE_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
-##
-
-#------ PlaneGCS ------
-export PLANEGCS_ROOT_DIR=${SHAPER_PDIR}/planegcs-0.16
-export LD_LIBRARY_PATH=${PLANEGCS_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
-##
-
-#------ Eigen ------
-export EIGEN_ROOT_DIR=${SHAPER_PDIR}/eigen-3.2.7
-##
-
-#------ Boost ------
-export BOOST_ROOT_DIR=${SHAPER_PDIR}/boost-1.52.0
-##
-
 #------ lcov ------
 export LCOV_ROOT_DIR=${SHAPER_PDIR}/lcov-1.11
 export PATH=${LCOV_ROOT_DIR}/bin:${PATH}
@@ -41,16 +23,7 @@ export CPPLINT_ROOT_DIR=${SHAPER_PDIR}/cpplint-1.3.0
 export PATH=${CPPLINT_ROOT_DIR}:${PATH}
 ##
 
-#------ OCCT ------
-# Defaults
-export CSF_PluginDefaults=${CAS_ROOT_DIR}/share/opencascade/resources/StdResource
-export CSF_StandardDefaults=${CAS_ROOT_DIR}/share/opencascade/resources/StdResource
-# For CMake
-export LIB=${LD_LIBRARY_PATH}
-export PATH=${CASROOT}:${PATH}
-##
-
 #------ SHAPER ------
 export PATH=${SHAPER_ROOT_DIR}/bin/salome:${PATH}
-export PYTHONPATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/python2.7/site-packages/salome:${PYTHONPATH}
+export PYTHONPATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/python3.6/site-packages/salome:${PYTHONPATH}
 export LD_LIBRARY_PATH=${SHAPER_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
diff --git a/env_salome.sh b/env_salome.sh
index ccaf3aebc..60752255b 100644
--- a/env_salome.sh
+++ b/env_salome.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 
-# Correcting path which defined with error
-export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}
+# Config path correction
 export SalomeAppConfig=${SHAPER_ROOT_DIR}/share/salome/resources/shaper:${GUI_ROOT_DIR}/share/salome/resources/gui
-- 
2.30.2