From 74a103ea26c81a3a64f0f92c32737cd6b211bce3 Mon Sep 17 00:00:00 2001
From: Philipp van Kempen <philipp.van-kempen@tum.de>
Date: Fri, 9 Jan 2026 16:27:37 +0100
Subject: [PATCH 1/3] improve error handling in wrapper scripts

---
 scripts/support/m2isar_perf_run_wrapper.sh | 1 +
 scripts/support/m2isar_run_wrapper.sh      | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/scripts/support/m2isar_perf_run_wrapper.sh b/scripts/support/m2isar_perf_run_wrapper.sh
index 4f4b525..37b0582 100755
--- a/scripts/support/m2isar_perf_run_wrapper.sh
+++ b/scripts/support/m2isar_perf_run_wrapper.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+set -e
 
 exe="python3 ${PSW_M2ISAR_PERF}/m2isar_perf/run.py"
 
diff --git a/scripts/support/m2isar_run_wrapper.sh b/scripts/support/m2isar_run_wrapper.sh
index 371ada4..4f419b1 100755
--- a/scripts/support/m2isar_run_wrapper.sh
+++ b/scripts/support/m2isar_run_wrapper.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 source ${PSW_M2ISAR}/venv/bin/activate
 echo $*
 $*

From cca0d955408b7d2682f331fe6fccccbc5418f21a Mon Sep 17 00:00:00 2001
From: Philipp van Kempen <philipp.van-kempen@tum.de>
Date: Mon, 12 Jan 2026 13:40:50 +0100
Subject: [PATCH 2/3] scripts/support/run_helper.py: support custom target sw

---
 scripts/support/run_helper.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/support/run_helper.py b/scripts/support/run_helper.py
index 536a730..56370d7 100755
--- a/scripts/support/run_helper.py
+++ b/scripts/support/run_helper.py
@@ -2,6 +2,7 @@
 import argparse
 import os
 import sys
+from pathlib import Path
 
 # Read input arguments
 argParser = argparse.ArgumentParser()
@@ -28,6 +29,8 @@
          targetSW = os.environ.get(targetSW_prefix + "FLOAT")
       else:
          raise RuntimeError(f"Target-SW float is currently not supported for {args.core.upper()}")
+   elif Path(args.targetSW).is_file():
+      targetSW = args.targetSW
    else:
       targetSW_failed = True
 elif len(split:=args.targetSW.split(":")) == 2:

From ae2d92571bd0df204b9dbf8a8760d9308030ea48 Mon Sep 17 00:00:00 2001
From: Philipp van Kempen <philipp.van-kempen@tum.de>
Date: Wed, 21 Jan 2026 14:43:03 +0100
Subject: [PATCH 3/3] .env: fix to support both bash and zsh

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index a52fb1a..42544a1 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-THIS_PATH=$(pwd)/$BASH_SOURCE # Path to this file
+THIS_PATH=$(pwd)/${BASH_SOURCE[0]:-${(%):-%N}} # Path to this file
 
 # Path to Performance Simulation Workspace (PSW)
 PSW_WORKSPACE=$(realpath $(dirname $THIS_PATH))