From 12c5ee0625e3226a7907852a91da748495d69354 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Sun, 22 May 2022 16:43:47 +0200
Subject: [PATCH] update helper scripts

---
 cmake/{scripts => }/cmake-build-cfg.py |  0
 cmake/scripts/stm32h7-make-debug.sh    | 33 ++++++++++++++++----------
 load-path.sh                           |  8 +++++++
 3 files changed, 29 insertions(+), 12 deletions(-)
 rename cmake/{scripts => }/cmake-build-cfg.py (100%)

diff --git a/cmake/scripts/cmake-build-cfg.py b/cmake/cmake-build-cfg.py
similarity index 100%
rename from cmake/scripts/cmake-build-cfg.py
rename to cmake/cmake-build-cfg.py
diff --git a/cmake/scripts/stm32h7-make-debug.sh b/cmake/scripts/stm32h7-make-debug.sh
index cffb68f..8f339dc 100755
--- a/cmake/scripts/stm32h7-make-debug.sh
+++ b/cmake/scripts/stm32h7-make-debug.sh
@@ -1,18 +1,27 @@
 #!/bin/sh
 counter=0
+init_dir=$(pwd)
 cfg_script_name="cmake-build-cfg.py"
-while [ ${counter} -lt 5 ]
-do
-    if [ -f ${cfg_script_name} ];then
-        break
-    fi
-    counter=$((counter=counter + 1))
-    cd ..
-done
+cfg_script=""
+if [ ! -z ${REPO_ROOT} ]; then
+    cfg_script=${REPO_ROOT}/cmake/${cfg_script_name}
+else
+    while [ ${counter} -lt 5 ]
+    do
+        if [ -f ${cfg_script_name} ];then
+            cfg_script=$(pwd)/${cfg_script_name}
+            break
+        fi
+        counter=$((counter=counter + 1))
+        cd ..
+    done
 
-if [ "${counter}" -ge 5 ];then
-    echo "${cfg_script_name} not found in upper directories!"
-    exit 1
+    if [ "${counter}" -ge 5 ];then
+        echo "${cfg_script_name} not found in upper directories!"
+        cd ${init_dir}
+        exit 1
+    fi
+    cd ${init_dir}
 fi
 
 build_generator=""
@@ -29,5 +38,5 @@ fi
 
 echo "Running command (without the leading +):"
 set -x # Print command 
-${python} ${cfg_script_name} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
+${python} ${cfg_script} -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
 # set +x
diff --git a/load-path.sh b/load-path.sh
index f394264..fbf4208 100755
--- a/load-path.sh
+++ b/load-path.sh
@@ -1,2 +1,10 @@
 #!/bin/bash
+if [ ! -d bsp_stm32h7_freertos ]; then
+	echo "This script should be sourced inside the example repository"
+	exit 1
+fi
+
 export PATH="$(pwd)/xpacks/.bin":$PATH
+export PATH="$(pwd)/cmake/scripts:$PATH"
+
+export REPO_ROOT="$(pwd)"