From 354c1d8604aa1e8be910d33d5501b9361b0ee1b9 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Tue, 16 Nov 2004 09:30:33 +0000
Subject: [PATCH] Fix PAL7001: - modify salome.(c)sh and env_products.(c)sh:
 add commands to clean duplication from the environment variables (PATH,
 LD_LIBRARY_PATH, PYTHONPATH, LD_RUN_PATH) and use these commands to process
 environment where it is needed; - exclude non-existing directories from
 environment variables.

---
 config_files/COMPONENT_BIN_2.1.0.sh    | 10 ++----
 config_files/GEOM_BIN_2.1.0.sh         | 10 ++----
 config_files/GHS3DPLUGIN_BIN_2.1.0.sh  | 12 ++-----
 config_files/KERNEL_BIN_2.1.0.sh       | 10 ++----
 config_files/MED_BIN_2.1.0.sh          | 10 ++----
 config_files/NETGENPLUGIN_BIN_2.1.0.sh | 12 ++-----
 config_files/PYCALCULATOR_BIN_2.1.0.sh | 12 ++-----
 config_files/SMESH_BIN_2.1.0.sh        | 10 ++----
 config_files/SUPERV_BIN_2.1.0.sh       | 10 ++----
 config_files/VISU_BIN_2.1.0.sh         | 10 ++----
 config_files/common.sh                 | 47 +++++++++++++++++++++-----
 11 files changed, 58 insertions(+), 95 deletions(-)

diff --git a/config_files/COMPONENT_BIN_2.1.0.sh b/config_files/COMPONENT_BIN_2.1.0.sh
index 77b6780..63375d6 100755
--- a/config_files/COMPONENT_BIN_2.1.0.sh
+++ b/config_files/COMPONENT_BIN_2.1.0.sh
@@ -19,10 +19,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export COMPONENT_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${COMPONENT_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${COMPONENT_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${COMPONENT_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${COMPONENT_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${COMPONENT_ROOT_DIR}/lib/salome:\${COMPONENT_ROOT_DIR}/lib/python2.2/site-packages/salome:\${COMPONENT_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -38,10 +35,7 @@ if [ $? -eq 0 ] ; then
 export COMPONENT_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${COMPONENT_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${COMPONENT_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${COMPONENT_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${COMPONENT_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${COMPONENT_ROOT_DIR}/lib/salome:\${COMPONENT_ROOT_DIR}/lib/python2.2/site-packages/salome:\${COMPONENT_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/GEOM_BIN_2.1.0.sh b/config_files/GEOM_BIN_2.1.0.sh
index db82a2f..2a42713 100755
--- a/config_files/GEOM_BIN_2.1.0.sh
+++ b/config_files/GEOM_BIN_2.1.0.sh
@@ -19,10 +19,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export GEOM_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${GEOM_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${GEOM_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${GEOM_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${GEOM_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${GEOM_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${GEOM_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${GEOM_ROOT_DIR}/bin/salome:\${GEOM_ROOT_DIR}/lib/salome:\${GEOM_ROOT_DIR}/lib/python2.2/site-packages/salome:\${GEOM_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -38,10 +35,7 @@ if [ $? -eq 0 ] ; then
 export GEOM_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${GEOM_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${GEOM_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${GEOM_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${GEOM_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${GEOM_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${GEOM_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${GEOM_ROOT_DIR}/bin/salome:\${GEOM_ROOT_DIR}/lib/salome:\${GEOM_ROOT_DIR}/lib/python2.2/site-packages/salome:\${GEOM_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/GHS3DPLUGIN_BIN_2.1.0.sh b/config_files/GHS3DPLUGIN_BIN_2.1.0.sh
index 62753e4..eebc338 100755
--- a/config_files/GHS3DPLUGIN_BIN_2.1.0.sh
+++ b/config_files/GHS3DPLUGIN_BIN_2.1.0.sh
@@ -18,12 +18,8 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GHS3DPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${GHS3DPLUGIN_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${GHS3DPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -37,12 +33,8 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GHS3DPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${GHS3DPLUGIN_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${GHS3DPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/KERNEL_BIN_2.1.0.sh b/config_files/KERNEL_BIN_2.1.0.sh
index e2446ce..764a5c3 100755
--- a/config_files/KERNEL_BIN_2.1.0.sh
+++ b/config_files/KERNEL_BIN_2.1.0.sh
@@ -19,10 +19,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export KERNEL_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${KERNEL_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib/salome:\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome:\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -38,10 +35,7 @@ if [ $? -eq 0 ] ; then
 export KERNEL_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${KERNEL_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib/salome:\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome:\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/MED_BIN_2.1.0.sh b/config_files/MED_BIN_2.1.0.sh
index a5e928c..4bf697a 100755
--- a/config_files/MED_BIN_2.1.0.sh
+++ b/config_files/MED_BIN_2.1.0.sh
@@ -19,10 +19,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export MED_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${MED_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${MED_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${MED_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${MED_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${MED_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${MED_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${MED_ROOT_DIR}/bin/salome:\${MED_ROOT_DIR}/lib/salome:\${MED_ROOT_DIR}/lib/python2.2/site-packages/salome:\${MED_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -38,10 +35,7 @@ if [ $? -eq 0 ] ; then
 export MED_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${MED_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${MED_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${MED_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${MED_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${MED_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${MED_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${MED_ROOT_DIR}/bin/salome:\${MED_ROOT_DIR}/lib/salome:\${MED_ROOT_DIR}/lib/python2.2/site-packages/salome:\${MED_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/NETGENPLUGIN_BIN_2.1.0.sh b/config_files/NETGENPLUGIN_BIN_2.1.0.sh
index 92a35dc..0cafd58 100755
--- a/config_files/NETGENPLUGIN_BIN_2.1.0.sh
+++ b/config_files/NETGENPLUGIN_BIN_2.1.0.sh
@@ -18,12 +18,8 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export NETGENPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${NETGENPLUGIN_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${NETGENPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -37,12 +33,8 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export NETGENPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${NETGENPLUGIN_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${NETGENPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/PYCALCULATOR_BIN_2.1.0.sh b/config_files/PYCALCULATOR_BIN_2.1.0.sh
index 450778b..b6e905d 100755
--- a/config_files/PYCALCULATOR_BIN_2.1.0.sh
+++ b/config_files/PYCALCULATOR_BIN_2.1.0.sh
@@ -18,11 +18,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYCALCULATOR_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${PYCALCULATOR_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PYCALCULATOR_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -37,11 +33,7 @@ if [ $? -eq 0 ] ; then
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYCALCULATOR_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${PYCALCULATOR_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PYCALCULATOR_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/SMESH_BIN_2.1.0.sh b/config_files/SMESH_BIN_2.1.0.sh
index c2c9b92..d0260ac 100755
--- a/config_files/SMESH_BIN_2.1.0.sh
+++ b/config_files/SMESH_BIN_2.1.0.sh
@@ -19,10 +19,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export SMESH_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${SMESH_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${SMESH_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${SMESH_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${SMESH_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${SMESH_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${SMESH_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${SMESH_ROOT_DIR}/bin/salome:\${SMESH_ROOT_DIR}/lib/salome:\${SMESH_ROOT_DIR}/lib/python2.2/site-packages/salome:\${SMESH_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -38,10 +35,7 @@ if [ $? -eq 0 ] ; then
 export SMESH_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${SMESH_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${SMESH_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${SMESH_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${SMESH_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${SMESH_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${SMESH_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${SMESH_ROOT_DIR}/bin/salome:\${SMESH_ROOT_DIR}/lib/salome:\${SMESH_ROOT_DIR}/lib/python2.2/site-packages/salome:\${SMESH_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/SUPERV_BIN_2.1.0.sh b/config_files/SUPERV_BIN_2.1.0.sh
index 2de2249..ca89c67 100755
--- a/config_files/SUPERV_BIN_2.1.0.sh
+++ b/config_files/SUPERV_BIN_2.1.0.sh
@@ -19,10 +19,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export SUPERV_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${SUPERV_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${SUPERV_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${SUPERV_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${SUPERV_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${SUPERV_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${SUPERV_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${SUPERV_ROOT_DIR}/bin/salome:\${SUPERV_ROOT_DIR}/lib/salome:\${SUPERV_ROOT_DIR}/lib/python2.2/site-packages/salome:\${SUPERV_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -38,10 +35,7 @@ if [ $? -eq 0 ] ; then
 export SUPERV_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${SUPERV_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${SUPERV_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${SUPERV_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${SUPERV_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${SUPERV_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${SUPERV_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${SUPERV_ROOT_DIR}/bin/salome:\${SUPERV_ROOT_DIR}/lib/salome:\${SUPERV_ROOT_DIR}/lib/python2.2/site-packages/salome:\${SUPERV_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/VISU_BIN_2.1.0.sh b/config_files/VISU_BIN_2.1.0.sh
index 005691e..63d382d 100755
--- a/config_files/VISU_BIN_2.1.0.sh
+++ b/config_files/VISU_BIN_2.1.0.sh
@@ -19,10 +19,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export VISU_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${VISU_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${VISU_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${VISU_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${VISU_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${VISU_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${VISU_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${VISU_ROOT_DIR}/bin/salome:\${VISU_ROOT_DIR}/lib/salome:\${VISU_ROOT_DIR}/lib/python2.2/site-packages/salome:\${VISU_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -38,10 +35,7 @@ if [ $? -eq 0 ] ; then
 export VISU_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${VISU_ROOT_DIR}/bin/salome:\${PATH}
 export LD_LIBRARY_PATH=\${VISU_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${VISU_ROOT_DIR}/bin/salome:\${PYTHONPATH}
-export PYTHONPATH=\${VISU_ROOT_DIR}/lib/salome:\${PYTHONPATH}
-export PYTHONPATH=\${VISU_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
-export PYTHONPATH=\${VISU_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
+export PYTHONPATH=\${VISU_ROOT_DIR}/bin/salome:\${VISU_ROOT_DIR}/lib/salome:\${VISU_ROOT_DIR}/lib/python2.2/site-packages/salome:\${VISU_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/common.sh b/config_files/common.sh
index 2d5415a..feca5a1 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -88,27 +88,56 @@ if [ $# -eq 3 ] ; then
     product_env=${install_work}/env_${product_name}.sh
     (test -e ${product_env} && rm ${product_env} )
 fi
-
+### !!! writing salome.sh file !!! -> add global functions
 cat >> ${install_work}/$SHRC <<EOF
 export INSTALL_ROOT=${install_root}
+#$DELIM globals $DELIM
+setenvp() {
+    xenv=\$2:\`printenv \$1\`
+    out_var=\`echo \$xenv | awk -F: '{n=0 ; for(i=1;i<=NF;i++){v=\$i;t=1;for(j=0;j<=n;j++){if(keys[j]==v){t=0;break;}};if(t)keys[n++]=v} ; for(j=0;j<n;j++){printf "%s",keys[j];if(j<n-1) printf ":"} ; printf "\n"}'\`
+    export \$1=\$out_var
+}
+
+setenva() {
+    xenv=\`printenv \$1\`:\$2
+    out_var=\`echo \$xenv | awk -F: '{n=0 ; for(i=NF;i>=1;i--){v=\$i;t=1;for(j=0;j<=n;j++){if(keys[j]==v){t=0;break;}};if(t)keys[n++]=v} ; for(j=n-1;j>=0;j--){printf "%s",keys[j];if(j>0) printf ":"} ; printf "\n"}'\`
+    export \$1=\$out_var
+}
 EOF
-product_sequence="$2"
-#for i in `ls -a ${install_work} | grep -E "..*" | grep -v ".salome.*"` ; do
-for i in $product_sequence ; do
-    cat ${install_work}/env_${i}.sh >> ${install_work}/$SHRC 2>/dev/null
-done 
+### !!! writing salome.csh file !!! -> add global aliases
+cat >> ${install_work}/$CSHRC <<EOF
+setenv INSTALL_ROOT ${install_root}
+#$DELIM globals $DELIM
+alias cleandup  "echo \!:1 | awk -F: '"'{n=0 ; for(i=1;i<=NF;i++){v=\$i;t=1;for(j=0;j<=n;j++){if(keys[j]==v){t=0;break;}};if(t)keys[n++]=v} ; for(j=0;j<n;j++){printf "%s",keys[j];if(j<n-1) printf ":"} ; printf "\n"}'"'"
+alias cleandupr "echo \!:1 | awk -F: '"'{n=0 ; for(i=NF;i>=1;i--){v=\$i;t=1;for(j=0;j<=n;j++){if(keys[j]==v){t=0;break;}};if(t)keys[n++]=v} ; for(j=n-1;j>=0;j--){printf "%s",keys[j];if(j>0) printf ":"} ; printf "\n"}'"'"
 
-sed -e 's%^export \([[:alnum:]_[:blank:]]*\)\=%setenv \1 %g' -e 's%^#csh-specific  %%g' ${INSTALL_WORK}/$SHRC > ${INSTALL_WORK}/_$CSHRC
+alias setenva 'set a="\!:1" ; set b=\`printenv \$a\`:"'\!:2'" ; set b=\`cleandupr \$b\` ; setenv \$a \$b ; unset a, b'
+alias setenvp 'set a="\!:1" ; set b="'\!:2'":\`printenv \$a\` ; set b=\`cleandup \$b\`  ; setenv \$a \$b ; unset a, b'
+EOF
+### !!! writing salome.csh file !!! -> set inital variables
 pre_vars="PATH LD_LIBRARY_PATH LD_RUN_PATH PYTHONPATH"
 for i in $pre_vars ; do
 cat >> ${install_work}/$CSHRC <<EOF
+#$DELIM initial settings $DELIM
 if (! (\$?${i}) ) then
   setenv $i
 endif
 EOF
 done
-cat ${INSTALL_WORK}/_$CSHRC >> ${INSTALL_WORK}/$CSHRC
-rm -f ${INSTALL_WORK}/_$CSHRC
+### !!! writing salome.(c)sh files !!! -> dump products environment files, changing 'export' by 'setenv(a|b)' where necessary
+product_sequence="$2"
+for i in $product_sequence ; do
+    sed -e 's%^export\([[:blank:]]*\)PATH=\$[{]\?PATH[}]\?:\(.*\)%setenva\1PATH \2%g' -e 's%^export\([[:blank:]]*\)PATH=\(.*\):\$[{]\?PATH[}]\?%setenvp\1PATH \2%g' ${install_work}/env_${i}.sh > ${INSTALL_WORK}/_tmp1 2>/dev/null
+    sed -e 's%^export\([[:blank:]]*\)LD_LIBRARY_PATH=\$[{]\?LD_LIBRARY_PATH[}]\?:\(.*\)%setenva\1LD_LIBRARY_PATH \2%g' -e 's%^export\([[:blank:]]*\)LD_LIBRARY_PATH=\(.*\):\$[{]\?LD_LIBRARY_PATH[}]\?%setenvp\1LD_LIBRARY_PATH \2%g' ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2 2>/dev/null
+    sed -e 's%^export\([[:blank:]]*\)PYTHONPATH=\$[{]\?PYTHONPATH[}]\?:\(.*\)%setenva\1PYTHONPATH \2%g' -e 's%^export\([[:blank:]]*\)PYTHONPATH=\(.*\):\$[{]\?PYTHONPATH[}]\?%setenvp\1PYTHONPATH \2%g' ${INSTALL_WORK}/_tmp2 > ${INSTALL_WORK}/_tmp1 2>/dev/null
+    sed -e 's%^export\([[:blank:]]*\)LD_RUN_PATH=\$[{]\?LD_RUN_PATH[}]\?:\(.*\)%setenva\1LD_RUN_PATH \2%g' -e 's%^export\([[:blank:]]*\)LD_RUN_PATH=\(.*\):\$[{]\?LD_RUN_PATH[}]\?%setenvp\1LD_RUN_PATH \2%g' ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2 2>/dev/null
+    cat ${INSTALL_WORK}/_tmp2 >> ${install_work}/$SHRC 2>/dev/null
+    
+    sed -e 's%^export \([[:alnum:]_[:blank:]]*\)\=%setenv \1 %g' ${INSTALL_WORK}/_tmp2 > ${INSTALL_WORK}/_tmp1 2>/dev/null
+    cat ${INSTALL_WORK}/_tmp1 >> ${install_work}/$CSHRC 2>/dev/null
+
+    rm -f ${INSTALL_WORK}/_tmp1 ${INSTALL_WORK}/_tmp2
+done 
 
 if [ $# -eq 4 ] ; then
     product_dir=$4
-- 
2.39.2