Fix for the issue #593: do not remove naming attribute, but use TNaming_Builder for...

[modules/shaper.git] / salome_run.sh

diff --git a/salome_run.sh b/salome_run.sh
index 552347f7cf801928e543ee00d4b2a23ff8312dee..726ead4d1b130f6e3e9189b468e625e48b1a7189 100755 (executable)
--- 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"