From ea04919978483955f3ae35ae18eda181d19effa1 Mon Sep 17 00:00:00 2001
From: Yngve Levinsen <yngve.levinsen@ess.eu>
Date: Tue, 3 Mar 2020 12:03:35 +0100
Subject: [PATCH] better check for binary in tracewin script
---
scripts/tracewin | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/scripts/tracewin b/scripts/tracewin
index 3706ce3..8545565 100644
--- a/scripts/tracewin
+++ b/scripts/tracewin
@@ -3,6 +3,7 @@ from __future__ import print_function
import argparse
import os
+import shutil
import subprocess
# This script simply runs TraceWin CLI version.
@@ -53,7 +54,14 @@ parser.add_argument('-s', '--seed', dest='seed',
args = parser.parse_args()
# A list to be filled depending on arguments given...
-cmd = ["TraceWin64_noX11", "'"+args.project+"'", "hide_esc"]
+binary = None
+for c in ["TraceWin64_noX11", "TraceWin_cli"]:
+ if shutil.which(c):
+ binary = c
+ break
+if binary is None:
+ raise ValueError("Could not find the TraceWin binary")
+cmd = [binary, f"'{args.project}'", "hide_esc"]
# Check that project path exist:
if not os.path.isfile(args.project):
--
GitLab