X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2FrunConsole.py;h=bdaafb58fab23157d2ed10a7d9f53a60fefab950;hb=d1a36be37c4d5971f3c7fe59a4ef608baf658caa;hp=8e3e25b6a9ee4a9ddd527e6009973b85c050df5f;hpb=507c19e30d7d99d2055a6dbd62fad2104dcdf9f4;p=modules%2Fkernel.git

diff --git a/bin/runConsole.py b/bin/runConsole.py
old mode 100644
new mode 100755
index 8e3e25b6a..bdaafb58f
--- a/bin/runConsole.py
+++ b/bin/runConsole.py
@@ -1,5 +1,6 @@
+#! /usr/bin/env python3
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -61,7 +62,7 @@ For example:
     (options, args) = parser.parse_args(args)
   except Exception as e:
     print(e)
-    return
+    return {}, []
 
   return options, args
 #
@@ -161,7 +162,7 @@ def start_client():
   if session_server:
     session = clt.waitNS("/Kernel/Session")
   catalog = clt.waitNS("/Kernel/ModulCatalog")
-  studyMgr = clt.waitNS("/myStudyManager")
+  study = clt.waitNS("/Study")
 
   import salome
   salome.salome_init()
@@ -197,7 +198,7 @@ def connect(args=None, env=None):
   options, args = __parse_args(args)
   host, port, filename = __get_running_session(options.port)
   if not port:
-    sys.exit(0)
+    return 1
 
   cmd = [
     "os.environ['OMNIORB_CONFIG'] = '%s'"%filename,
@@ -215,10 +216,11 @@ def connect(args=None, env=None):
     import subprocess
     absoluteAppliPath = os.getenv('ABSOLUTE_APPLI_PATH','')
     env_copy = os.environ.copy()
-    cmdDump=pickle.dumps(cmd,protocol=0)
-    cmdString=cmdDump.decode()
-    proc = subprocess.Popen(['python', os.path.join(absoluteAppliPath,"bin","salome","runConsole.py"), cmdString], shell=False, close_fds=True, env=env_copy)
-    return proc.communicate()
+    cmdDump = pickle.dumps(cmd, protocol=0)
+    cmdString = cmdDump.decode()
+    proc = subprocess.Popen(['python3', os.path.join(absoluteAppliPath,"bin","salome","runConsole.py"), cmdString], shell=False, close_fds=True, env=env_copy)
+    proc.communicate()
+    return proc.returncode
 #
 
 if __name__ == "__main__":