#!/bin/bash
-# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# 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`
. ${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
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)
}
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`