From 745f98499ef73de586cae1c2711a9293e7d57a2e Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 29 Jan 2014 10:35:15 +0000 Subject: [PATCH] Fix the following problems: 1) Run scripts on WINDOWS platform: use " & " as command separator (windows analog of the " ; " in linux); 2) Always run command in the format "PYTHONEXECUTABLE script.py args" even on Linux, because script.py may be without execute permission. --- bin/salomeLauncherUtils.py.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/salomeLauncherUtils.py.in b/bin/salomeLauncherUtils.py.in index 877bd8cb9..27d6997a4 100644 --- a/bin/salomeLauncherUtils.py.in +++ b/bin/salomeLauncherUtils.py.in @@ -130,10 +130,15 @@ def formatScriptsAndArgs(scriptArgs=[]): commands = [] for sc_dict in scriptArgs: for script, sc_args in sc_dict.items(): # single entry - cmd = script + cmd = "@PYTHONBIN@ " + script if sc_args: cmd = cmd + " " + " ".join(sc_args) commands.append(cmd) + sep = " ; " + if sys.platform == "win32": + sep= " & " + command = sep.join(["%s"%x for x in commands]) + command = "; ".join(["%s"%x for x in commands]) return command -- 2.39.2