From: vsr <vsr@opencascade.com>
Date: Tue, 9 Oct 2012 16:28:34 +0000 (+0000)
Subject: Modify runSalome script - the python scripts should be executed in GUI only if it... 
X-Git-Tag: V6_6_0a1~13
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=339d6fcdb830b554a79a70390519a011c34e8c22;p=modules%2Fkernel.git

Modify runSalome script - the python scripts should be executed in GUI only if it is started (--gui / -g option) and desktop is activated (--show-desktop=1 / -d1 option); otherwise the scripts, if specified, should be executed in the external Python.
---

diff --git a/bin/runSalome.py b/bin/runSalome.py
index c56da55cf..7ced786fe 100755
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -276,6 +276,10 @@ class SessionServer(Server):
                     self.SCMD2+=['--study-hdf=%s'%self.args['study_hdf']]
                     pass
                 pass
+                if self.args.has_key('pyscript') and len(self.args['pyscript']) > 0:
+                    self.SCMD2+=['--pyscript=%s'%(",".join(self.args['pyscript']))]
+                    pass
+                pass
             pass
         if self.args['noexcepthandler']:
             self.SCMD2+=['noexcepthandler']
@@ -294,9 +298,8 @@ class SessionServer(Server):
                   list_modules.insert(0,m)
             list_modules.reverse()
             self.SCMD2+=['--modules (%s)' % ":".join(list_modules)]
-
-        if self.args.has_key('pyscript') and len(self.args['pyscript']) > 0:
-            self.SCMD2+=['--pyscript=%s'%(",".join(self.args['pyscript']))]
+            pass
+        pass
 
     def setpath(self,modules_list,modules_root_dir):
         list_modules = modules_list[:]