X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=env_linux.sh;h=8148a14623f91950419ba7f343308a66afabe0a7;hb=af51a18716c84f3221875754fe4c41c49e6d4ac7;hp=c376a2059cd44cc8a48e5aa9fe8c6e381e1c12cf;hpb=60a74f80e93d09ce5dce729bfaaba7ec67af8753;p=modules%2Fshaper.git diff --git a/env_linux.sh b/env_linux.sh index c376a2059..8148a1462 100644 --- a/env_linux.sh +++ b/env_linux.sh @@ -2,11 +2,10 @@ # This script uses: # -# INST_ROOT - path of SALOME (env_products.sh) # SHAPER_PDIR - path of PRODUCTS for SHAPER (SolveSpace, lcov) # SHAPER_ROOT_DIR - path of SHAPER installation -for path in INST_ROOT SHAPER_PDIR SHAPER_ROOT_DIR; do +for path in SHAPER_PDIR SHAPER_ROOT_DIR; do if [[ -z ${!path+x} ]]; then echo "${path} not found."; exit 1 else @@ -14,11 +13,6 @@ for path in INST_ROOT SHAPER_PDIR SHAPER_ROOT_DIR; do fi done -set +u -echo "Source ${INST_ROOT}/$(cd ${INST_ROOT} && ls *env_products.sh)" -source ${INST_ROOT}/$(cd ${INST_ROOT} && ls *env_products.sh) -set -u - #------ SolveSpace ------ export SOLVESPACE_ROOT_DIR=${SHAPER_PDIR}/solvespace-2.1 export LD_LIBRARY_PATH=${SOLVESPACE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} @@ -52,6 +46,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 LD_LIBRARY_PATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH} +export PATH=${SHAPER_ROOT_DIR}/bin/salome:${PATH} +export PYTHONPATH=${SHAPER_ROOT_DIR}/bin/salome:${PYTHONPATH} +export LD_LIBRARY_PATH=${SHAPER_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}