From b80afea98550025b42d998171a1f41c344e7ae19 Mon Sep 17 00:00:00 2001 From: Keith Hanson <122566160+anskhanson@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:26:12 -0400 Subject: [PATCH 1/2] updated launcher for linux --- src/ansys/sherlock/core/launcher.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ansys/sherlock/core/launcher.py b/src/ansys/sherlock/core/launcher.py index a5664bb6f..1736bec01 100644 --- a/src/ansys/sherlock/core/launcher.py +++ b/src/ansys/sherlock/core/launcher.py @@ -3,6 +3,7 @@ """Module for launching Sherlock locally or connecting to a local instance with gRPC.""" import errno import os +import shlex import socket import subprocess import time @@ -78,7 +79,7 @@ def launch_sherlock( args = f'{args} -singleProject "{single_project_path}"' if sherlock_cmd_args != "": args = f"{args} {sherlock_cmd_args}" - subprocess.Popen(args) + subprocess.Popen(shlex.split(args)) except Exception as e: LOG.error("Error encountered while starting or executing Sherlock, error = %s" + str(e)) @@ -153,5 +154,8 @@ def _get_sherlock_exe_path(): ansys_base = _get_base_ansys() if not ansys_base: return "" - sherlock_bin = os.path.join(ansys_base, "sherlock", "SherlockClient.exe") + if os.name == "nt": + sherlock_bin = os.path.join(ansys_base, "sherlock", "SherlockClient.exe") + else: + sherlock_bin = os.path.join(ansys_base, "sherlock", "runSherlock") return sherlock_bin From e295b6e3bdd3d8fc0a162b62a324ca3ee4d6ac0c Mon Sep 17 00:00:00 2001 From: Keith Hanson <122566160+anskhanson@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:38:45 -0400 Subject: [PATCH 2/2] updated sherlock parameter parsing --- src/ansys/sherlock/core/launcher.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ansys/sherlock/core/launcher.py b/src/ansys/sherlock/core/launcher.py index 1736bec01..e64342ce7 100644 --- a/src/ansys/sherlock/core/launcher.py +++ b/src/ansys/sherlock/core/launcher.py @@ -74,12 +74,14 @@ def launch_sherlock( return None try: - args = _get_sherlock_exe_path() + " -grpcPort=" + str(port) + args = [_get_sherlock_exe_path()] + args.append("-grpcPort=" + str(port)) if single_project_path != "": - args = f'{args} -singleProject "{single_project_path}"' + args.append(f'-singleProject "{single_project_path}"') if sherlock_cmd_args != "": - args = f"{args} {sherlock_cmd_args}" - subprocess.Popen(shlex.split(args)) + args.append(f"{shlex.split(sherlock_cmd_args)}") + print(args) + subprocess.Popen(args) except Exception as e: LOG.error("Error encountered while starting or executing Sherlock, error = %s" + str(e))