Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug fix: omninames kill
[modules/kernel.git]
/
bin
/
appliskel
/
runAppli
diff --git
a/bin/appliskel/runAppli
b/bin/appliskel/runAppli
index 4abe783d04a8e540534ceffa1958c23594a9b0e8..a5e59d684611da6ae332b2bfaca1221ba5d8d438 100755
(executable)
--- a/
bin/appliskel/runAppli
+++ b/
bin/appliskel/runAppli
@@
-1,5
+1,5
@@
#!/bin/bash
#!/bin/bash
-# Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-201
4
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
#
# 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
# 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
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-25,12
+25,13
@@
###############################################
############### IMPORTANT NOTE ################
###############################################
###############################################
############### IMPORTANT NOTE ################
###############################################
-# The run
Console script is obsolete.
#
-# Please consider the new salome
.py launcher.
#
+# The run
Appli script is obsolete.
#
+# Please consider the new salome
launcher.
#
###############################################
###############################################
-APPLI_HOME=`dirname $0`
+#APPLI_HOME=`dirname $0`
+APPLI_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# --- retrieve APPLI path, relative to $HOME, set ${APPLI}
# --- retrieve APPLI path, relative to $HOME, set ${APPLI}
@@
-40,6
+41,9
@@
export APPLI=`${APPLI_HOME}/getAppliPath.py`
. ${HOME}/${APPLI}/envd ${HOME}/${APPLI}
. ${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)
# --- if mpi lam, start lam (seems safe to be done several times)
# (manual stop with lamhalt)