From a92692f349d089cfa64fd5e77c9013247f0dbb81 Mon Sep 17 00:00:00 2001 From: jfa Date: Wed, 15 Apr 2020 16:26:57 +0300 Subject: [PATCH] bos #18341: HOME environment variable --- .../bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/bin/runSalome.py | 3 ++- .../src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/bin/runSalome.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/wrappergen/bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/bin/runSalome.py b/src/wrappergen/bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/bin/runSalome.py index a871e347a..0e73667b3 100755 --- a/src/wrappergen/bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/bin/runSalome.py +++ b/src/wrappergen/bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/bin/runSalome.py @@ -180,7 +180,8 @@ class Server: class CatalogServer(Server): SCMD1=['SALOME_ModuleCatalog_Server','-common'] - SCMD2=['-personal','${HOME}/Salome/resources/CatalogModulePersonnel.xml'] + home_dir=os.path.expanduser("~") + SCMD2=['-personal',os.path.join(home_dir,'Salome', 'resources', 'CatalogModulePersonnel.xml')] def setpath(self,liste_modules): cata_path=[] diff --git a/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/bin/runSalome.py b/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/bin/runSalome.py index a871e347a..0e73667b3 100755 --- a/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/bin/runSalome.py +++ b/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/bin/runSalome.py @@ -180,7 +180,8 @@ class Server: class CatalogServer(Server): SCMD1=['SALOME_ModuleCatalog_Server','-common'] - SCMD2=['-personal','${HOME}/Salome/resources/CatalogModulePersonnel.xml'] + home_dir=os.path.expanduser("~") + SCMD2=['-personal',os.path.join(home_dir,'Salome', 'resources', 'CatalogModulePersonnel.xml')] def setpath(self,liste_modules): cata_path=[] -- 2.30.2