Merge branch 'agr/extra_env'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab2e7838ee240c55416d685ccfcda8613c5436d4..0d198198a370b7319673c2cf05e5e569112de8d1 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Our own set of macros:
 LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/salome_adm/cmake_files")

diff --git a/src/ResourcesManager/ResourcesManager.cxx b/src/ResourcesManager/ResourcesManager.cxx
index 484b856b7f1b3655e554d9517ec16eb96c365bb2..ba27107b4257e04fe47893d323757728c18d95bf 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.cxx
+++ b/src/ResourcesManager/ResourcesManager.cxx
@@ -603,7 +603,12 @@ void ResourcesManager_cpp::AddDefaultResourceInCatalog()
   {
     resource.AppliPath = string(getenv("HOME")) + "/" + getenv("APPLI");
   }
-  resource.working_directory = "/tmp/salome_localres_workdir";
+  string tmpdir = "/tmp";
+  if (getenv("TMPDIR") != NULL)
+    tmpdir = getenv("TMPDIR");
+  resource.working_directory = tmpdir + "/salome_localres_workdir";
+  if (getenv("USER") != NULL)
+    resource.working_directory += string("_") + getenv("USER");
   resource.can_launch_batch_jobs = true;
   resource.can_run_containers = true;
   _resourcesList[resource.Name] = resource;