Fix bug in OMNIORB_USER_PATH

diff --git a/bin/appliskel/runAppli b/bin/appliskel/runAppli
index 91d6cb73b2f7da6799c02a7b94982d2ce2d369f2..98470619088c9057914c6a6d84cc4193ff782d04 100755 (executable)
--- a/bin/appliskel/runAppli
+++ b/bin/appliskel/runAppli
@@ -42,7 +42,7 @@ export APPLI=`${APPLI_HOME}/getAppliPath.py`
 . ${HOME}/${APPLI}/envd ${HOME}/${APPLI}
 
 #export OMNIORB_USER_PATH="${HOME}/.salomeConfig/USERS"
-export OMNIORB_USER_PATH="${APPLI}/USERS"
+export OMNIORB_USER_PATH="${HOME}/${APPLI}/USERS"
 
 # --- if mpi lam, start lam (seems safe to be done several times)
 #     (manual stop with lamhalt)

diff --git a/bin/appliskel/runConsole b/bin/appliskel/runConsole
index c856336be7a13d23f0b94da990f3b674c816944b..9667e7e89c21eb790e8b5c23a1182bf5f60faf8e 100755 (executable)
--- a/bin/appliskel/runConsole
+++ b/bin/appliskel/runConsole
@@ -41,7 +41,7 @@ export APPLI=`${APPLI_HOME}/getAppliPath.py`
 . ${HOME}/${APPLI}/envd ${HOME}/${APPLI}
 
 #export OMNIORB_USER_PATH="${HOME}/.salomeConfig/USERS"
-export OMNIORB_USER_PATH="${APPLI}/USERS"
+export OMNIORB_USER_PATH="${HOME}/${APPLI}/USERS"
 
 # --- open a Python interpreter with SALOME environment
 

diff --git a/bin/appliskel/runSession b/bin/appliskel/runSession
index a7b46852e05889161b799e8e7c84cc0fb1ddeb18..294cae70ea62e42c1e3b61048aa1ba2ad525cdf9 100755 (executable)
--- a/bin/appliskel/runSession
+++ b/bin/appliskel/runSession
@@ -78,7 +78,7 @@ export APPLI=`${APPLI_HOME}/getAppliPath.py`
 . ${HOME}/${APPLI}/envd ${HOME}/${APPLI}
 
 #export OMNIORB_USER_PATH="${HOME}/.salomeConfig/USERS"
-export OMNIORB_USER_PATH="${APPLI}/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

diff --git a/bin/runSalome.py b/bin/runSalome.py
index 851c16aee89ffff3c3393beb45d27a3a7359196c..60e4de11b043b800b64b9c27f3128b03e285dc9c 100755 (executable)
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -923,10 +923,10 @@ def runSalome():
 if __name__ == "__main__":
 
     ### TEMP ###
-    #homePath = os.path.realpath(os.path.expanduser('~'))
+    homePath = os.path.realpath(os.path.expanduser('~'))
     #defaultOmniorbUserPath = os.path.join(homePath, ".salomeConfig/USERS")
     appli = os.getenv("APPLI")
-    defaultOmniorbUserPath = os.path.join(appli, "/USERS")
+    defaultOmniorbUserPath = os.path.join(homePath, appli, "USERS")
     os.environ["OMNIORB_USER_PATH"] = defaultOmniorbUserPath
     ############