Avoid additionnal CORBA invocation to clear context

[modules/kernel.git] / bin / appli_gen.py

diff --git a/bin/appli_gen.py b/bin/appli_gen.py
index 269573403290573ea7c11368138a966a1289bfc8..1a190462f0c71e4748d0723734fe32a5c5dd81d6 100755 (executable)
--- a/bin/appli_gen.py
+++ b/bin/appli_gen.py
@@ -1,5 +1,5 @@
 #! /usr/bin/env python3
-# Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -283,9 +283,6 @@ def install(prefix, config_file, verbose=0):
                'runRemote.sh',
                'runRemoteSSL.sh',
                '.salome_run',
-               'salome',
-               'salome_mesa',
-               'salome_common.py',
                'update_catalogs.py',
                '.bashrc',
                ):
@@ -313,6 +310,19 @@ def install(prefix, config_file, verbose=0):
             fd.write('#!/bin/bash\n')
             fd.write('module load %s\n' % (' '.join(env_modules)))
 
+    # Copy salome / salome_mesa scripts:
+
+    for scripts in ('salome', 'salome_mesa', 'salome_common.py'):
+        salome_script = open(os.path.join(appliskel_dir, scripts)).read()
+        salome_file = os.path.join(home_dir, scripts)
+        try:
+            os.remove(salome_file)
+        except Exception:
+            pass
+        with open(salome_file, 'w') as fd:
+            fd.write(salome_script.replace('MODULES = []', 'MODULES = {}'.format(env_modules)))
+            os.chmod(salome_file, 0o755)
+
     # Add .salome-completion.sh file
     shutil.copyfile(os.path.join(appliskel_dir, ".salome-completion.sh"),
                     os.path.join(home_dir, ".salome-completion.sh"))