X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=salome_run.sh;h=726ead4d1b130f6e3e9189b468e625e48b1a7189;hb=2e39226506e4b82f6ae5dcc26e776571801b1555;hp=552347f7cf801928e543ee00d4b2a23ff8312dee;hpb=a66a1008a2d33e0abb45b5f3fb350a6af8432e6f;p=modules%2Fshaper.git diff --git a/salome_run.sh b/salome_run.sh index 552347f7c..726ead4d1 100755 --- a/salome_run.sh +++ b/salome_run.sh @@ -3,11 +3,15 @@ export ROOT_DIR=$(pwd)/.. export ROOT_DIR=`cd "${ROOT_DIR}";pwd` -source ${ROOT_DIR}/sources/linux_env.sh +source ${ROOT_DIR}/sources/salome_env.sh +source ${ROOT_DIR}/sources/linux_env.sh $1 + +INSTALL_DIR=install +if [ $1 ]; then INSTALL_DIR=${INSTALL_DIR}-$1; fi # Correcting path which defined with error export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH} -export SalomeAppConfig=${ROOT_DIR}/install/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui +export SalomeAppConfig=${ROOT_DIR}/${INSTALL_DIR}/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui ${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/envSalome.py" ${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/runSalome.py"