bug fix: omninames kill

[modules/kernel.git] / bin / appliskel / runAppli

diff --git a/bin/appliskel/runAppli b/bin/appliskel/runAppli
index be805d3614fd41b7305b0bd8790909cb6030c081..a5e59d684611da6ae332b2bfaca1221ba5d8d438 100755 (executable)
--- a/bin/appliskel/runAppli
+++ b/bin/appliskel/runAppli
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2014  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
@@ -7,7 +7,7 @@
 # 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
@@ -21,7 +21,17 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-APPLI_HOME=`dirname $0`
+
+###############################################
+############### IMPORTANT NOTE ################
+###############################################
+# The runAppli script is obsolete.           #
+# Please consider the new salome launcher.    #
+###############################################
+
+
+#APPLI_HOME=`dirname $0`
+APPLI_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # --- retrieve APPLI path, relative to $HOME, set ${APPLI}
 
@@ -31,6 +41,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"
+
 # --- if mpi lam, start lam (seems safe to be done several times)
 #     (manual stop with lamhalt)
 
@@ -46,5 +59,5 @@ if [ $# -ne 0 ] ; then
     ${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/runSalome.py $*
 
 else
-    ${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/runSalome.py 
+    ${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/runSalome.py
 fi