Simplification of environment due to SALOME standards

diff --git a/env_Salome.bat b/env_Salome.bat
index 980ed7b0326d9a2cd3c20cc8dc7e08132a5b7325..e61088b139f030299a89ef7e5bb3d0a7f5498bba 100644 (file)
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -100,7 +100,7 @@ IF "%ARCH%" == "Win64" (
 )
 
 @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
-@SET PATH=%SHAPER_ROOT_DIR%\bin\salome;%SHAPER_ROOT_DIR%\lib\salome;%PATH%
-@SET PYTHONPATH=%SHAPER_ROOT_DIR%\bin\salome;%SHAPER_ROOT_DIR%\lib\salome;%PYTHONPATH%
+@SET PATH=%SHAPER_ROOT_DIR%\lib\salome;%PATH%
+@SET PYTHONPATH=%SHAPER_ROOT_DIR%\lib\salome;%PYTHONPATH%
 
 @SET LightAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui

diff --git a/env_linux.sh b/env_linux.sh
index c376a2059cd44cc8a48e5aa9fe8c6e381e1c12cf..adff9d99ac5512ca512d55e26f79c5424bbc4a29 100644 (file)
--- a/env_linux.sh
+++ b/env_linux.sh
@@ -52,6 +52,6 @@ export PATH=${CASROOT}:${PATH}
 ##
 
 #------ SHAPER ------
-export PATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${PATH}
-export PYTHONPATH=${SHAPER_ROOT_DIR}//bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${PYTHONPATH}
+export PATH=${SHAPER_ROOT_DIR}/lib/salome:${PATH}
+export PYTHONPATH=${SHAPER_ROOT_DIR}/bin/salome:${PYTHONPATH}
 export LD_LIBRARY_PATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}