From 0b7654b31c9ed9bcfe2819856b9037ed43ea990b Mon Sep 17 00:00:00 2001
From: aguerre <aguerre>
Date: Mon, 17 Jun 2013 16:15:14 +0000
Subject: [PATCH] Fix bug in OMNIORB_USER_PATH

---
 bin/appliskel/runAppli   | 2 +-
 bin/appliskel/runConsole | 2 +-
 bin/appliskel/runSession | 2 +-
 bin/runSalome.py         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/appliskel/runAppli b/bin/appliskel/runAppli
index 91d6cb73b..984706190 100755
--- 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 c856336be..9667e7e89 100755
--- 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 a7b46852e..294cae70e 100755
--- 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 851c16aee..60e4de11b 100755
--- 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
     ############
 
-- 
2.39.2