From bacce958811bbdb796a2573e14f16dd5b1e4cfc0 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 6 May 2022 15:38:50 +0200
Subject: [PATCH] corrections for install script

---
 scripts/install-obsw-yocto.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/scripts/install-obsw-yocto.sh b/scripts/install-obsw-yocto.sh
index 9298cb32..d7354f27 100755
--- a/scripts/install-obsw-yocto.sh
+++ b/scripts/install-obsw-yocto.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+init_dir=$(pwd)
 build_dir=cmake-build-release-q7s
 obsw_root=""
 q7s_yocto_dir="q7s-yocto"
@@ -9,9 +10,12 @@ yocto_obsw_path="yocto/meta-eive/recipes-core/eive-obsw/files"
 yocto_watchdog_path="yocto/meta-eive/recipes-support/eive-obsw-watchdog/files"
 obsw_bin_name="eive-obsw-stripped"
 watchdog_bin_name="eive-watchdog-stripped"
+obsw_target_name="eive-obsw"
+watchdog_target_name="eive-watchdog"
 
 if [ ! -z ${EIVE_OBSW_ROOT} ]; then
 	cd ${EIVE_OBSW_ROOT}
+  obsw_root=$(pwd)
 elif [ -d ${build_dir} ]; then
   obsw_root=${build_dir}
   :
@@ -27,7 +31,7 @@ yocto_root=""
 if [ -d ../${q7s_package_path} ]; then
   cd ../${q7s_package_path}
   yocto_root=$(pwd)
-elif [ -d ../${q7s_yocto_dir} ]
+elif [ -d ../${q7s_yocto_dir} ]; then
   cd ../${q7s_yocto_dir}
   yocto_root=$(pwd)
 fi
@@ -37,26 +41,27 @@ if [ -z ${yocto_root} ]; then
 fi
 
 cd ${obsw_root}
-
 if [ ! -d ${build_dir} ]; then
   echo "No Q7S Release binary folder ${build_dir} found. Exiting"
   exit 1
 fi
 
-if [ ! -f ${obsw_bin_name} ]; then
+if [ ! -f ${build_dir}/${obsw_bin_name} ]; then
   echo "No EIVE OBSW binary found to intall to yocto"
 else
-  cp_cmd="cp $(pwd)/${obsw_bin_name} ${yocto_root}/${yocto_obsw_path}/eive-obsw"
-  echo "Executing ${cp_cmd}"
+  cp_cmd="cp $(pwd)/${build_dir}/${obsw_bin_name} ${yocto_root}/${yocto_obsw_path}/${obsw_target_name}"
+  echo "Executing: ${cp_cmd}"
   eval ${cp_cmd}
   echo "Installed EIVE OBSW into yocto repository successfully"
 fi
 
-if [ ! -f ${watchdog_bin_name} ]; then
+if [ ! -f ${build_dir}/${watchdog_bin_name} ]; then
   echo "No EIVE Watchdog found to intall to yocto"
 else
-  cp_cmd="cp $(pwd)/${watchdog_bin_name} ${yocto_root}/${yocto_obsw_path}/eive-obsw"
-  echo "Executing ${cp_cmd}"
+  cp_cmd="cp $(pwd)/${build_dir}/${watchdog_bin_name} ${yocto_root}/${yocto_obsw_path}/${watchdog_target_name}"
+  echo "Executing: ${cp_cmd}"
   eval ${cp_cmd}
   echo "Installed EIVE watchdog into yocto repository successfully"
 fi
+
+cd ${init_dir}