PR: patch from Sergey Mozokhin (remote containers without SALOME APPLI)

diff --git a/bin/runSalome b/bin/runSalome
index d0c37cc5d3649058e676eb10e6331c411fd04cef..cf715b617d28285412397aa947f500e883d084d3 100755 (executable)
--- a/bin/runSalome
+++ b/bin/runSalome
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+save_config=$1
+
 searchFreePort() {
     echo -n "Searching for a free port for naming service: "
     export NSPORT=2810
@@ -19,6 +21,10 @@ searchFreePort() {
            else
                echo "ORBInitRef $initref" > $OMNIORB_CONFIG
            fi
+           if [[ "$save_config" == "--save-config" ]] ; then
+               ln -sf $OMNIORB_CONFIG ${HOME}/.omniORB_current.cfg
+               export OMNIORB_CONFIG=${HOME}/.omniORB_current.cfg
+           fi
             break
         fi
         echo -n "${NSPORT} "

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index 434aa876b91fff24f6e5a40377e032d5a6b53a6c..0f98680364a2fc82774f9a6ecc811cdb3b9ddde1 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -780,6 +780,8 @@ SALOME_ResourcesManager::BuildTempFileToLaunchRemoteContainer
 
   // --- set env vars
 
+  tempOutputFile << "source " << resInfo.PreReqFilePath << endl;
+
   for (map<string, string>::const_iterator iter = resInfo.ModulesPath.begin();
        iter != resInfo.ModulesPath.end();
        iter++)
@@ -791,15 +793,15 @@ SALOME_ResourcesManager::BuildTempFileToLaunchRemoteContainer
                     << "/lib/salome" << ":${LD_LIBRARY_PATH}" << endl;
       tempOutputFile << "PYTHONPATH=" << curModulePath << "/bin/salome:"
                     << curModulePath << "/lib/salome:" << curModulePath
-                    << "/lib/python2.2/site-packages/salome:";
+                    << "/lib/python${PYTHON_VERSION}/site-packages/salome:";
       tempOutputFile << curModulePath
-      << "/lib/python2.2/site-packages/salome/shared_modules:${PYTHONPATH}"
+      << "/lib/python${PYTHON_VERSION}/site-packages/salome/shared_modules:${PYTHONPATH}"
       << endl;
     }
 
   tempOutputFile << "export LD_LIBRARY_PATH" << endl;
   tempOutputFile << "export PYTHONPATH" << endl;
-  tempOutputFile << "source " << resInfo.PreReqFilePath << endl;
+  //tempOutputFile << "source " << resInfo.PreReqFilePath << endl;
 
   // ! env vars