X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2Fappliskel%2FrunSession;h=bc177290860906d132d6a39250c27847e10bba9b;hb=dfeb67c3e06c5f1ff9ad430cfa80868527936148;hp=d1318e87a4c51d5240d4f7ce836cf5be540297e8;hpb=6d9c102060aa7ad2e25f3e252ab2c1d57de4d38f;p=modules%2Fkernel.git diff --git a/bin/appliskel/runSession b/bin/appliskel/runSession index d1318e87a..bc1772908 100755 --- a/bin/appliskel/runSession +++ b/bin/appliskel/runSession @@ -26,14 +26,12 @@ # Use it without args to run an interactive shell under Salome env -echo "##############################################" -echo "############### IMPORTANT NOTE ###############" -echo "##############################################" -echo "# The runSession script is obsolete. #" -echo "# Please consider the new salome.py command. #" -echo "# More info: cedric.aguerre@edf.fr #" -echo "##############################################" - +############################################### +############### IMPORTANT NOTE ################ +############################################### +# The runSession script is obsolete. # +# Please consider the new salome launcher. # +############################################### APPLI_HOME=`dirname $0` @@ -79,6 +77,9 @@ export APPLI=`${APPLI_HOME}/getAppliPath.py` . ${HOME}/${APPLI}/envd ${HOME}/${APPLI} +#export OMNIORB_USER_PATH="${HOME}/.salomeConfig/USERS" +export OMNIORB_USER_PATH="${HOME}/${APPLI}/USERS" + # --- set the OMNIORB_CONFIG file and environment relative to this run of SALOME # Usage: writeConfigFile PORT HOST function writeConfigFile @@ -91,7 +92,7 @@ function writeConfigFile export NSHOST=$2 # Get (in bash) the configuration filename from (Python) ORBConfigFile return values - RETURN_VALUES=$(${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/ORBConfigFile.py ${HOME}/${APPLI}/USERS ${NSHOST} ${NSPORT} with_username=${USER}) + RETURN_VALUES=$(${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/ORBConfigFile.py ${OMNIORB_USER_PATH} ${NSHOST} ${NSPORT} with_username=${USER}) export OMNIORB_CONFIG=$(echo ${RETURN_VALUES} | cut -d' ' -f1) } @@ -101,9 +102,9 @@ if test "x${NSPORT}" == "xlast"; then if test "x${NSHOST}" == "xlocalhost"; then #MACHINE and PORT are not given # --- set omniORB configuration to current session if any - fileOmniConfig=${HOME}/${APPLI}/USERS/.omniORB_${USER}_last.cfg + fileOmniConfig=${OMNIORB_USER_PATH}/.omniORB_${USER}_last.cfg if [ -f $fileOmniConfig ]; then - export OMNIORB_CONFIG=${HOME}/${APPLI}/USERS/.omniORB_${USER}_last.cfg + export OMNIORB_CONFIG=${OMNIORB_USER_PATH}/.omniORB_${USER}_last.cfg # --- set environment variables for port and hostname of NamingService export NSHOST=`${KERNEL_ROOT_DIR}/bin/salome/NSparam.py host` export NSPORT=`${KERNEL_ROOT_DIR}/bin/salome/NSparam.py port`