From cd70e2064a9df7a0eb2a83324a5643184ee42efd Mon Sep 17 00:00:00 2001 From: Ben Lye Date: Sat, 10 Oct 2020 18:44:56 +0100 Subject: [PATCH] exit not return in bash scripts --- buildroot/bin/build_release_avr_noboot | 2 +- buildroot/bin/build_release_avr_optiboot | 2 +- buildroot/bin/build_release_orx | 3 ++- buildroot/bin/build_release_stm32f1_no_debug | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/buildroot/bin/build_release_avr_noboot b/buildroot/bin/build_release_avr_noboot index 25fab72..2257783 100644 --- a/buildroot/bin/build_release_avr_noboot +++ b/buildroot/bin/build_release_avr_noboot @@ -24,4 +24,4 @@ buildMulti; exitcode=$((exitcode+$?)); mv build/Multiprotocol.ino.bin ./binaries/multi-avr-usbasp-aetr-CYRF6936-inv-v$MULTI_VERSION.bin; -return $exitcode; +exit $exitcode; diff --git a/buildroot/bin/build_release_avr_optiboot b/buildroot/bin/build_release_avr_optiboot index bf0be5a..9526625 100644 --- a/buildroot/bin/build_release_avr_optiboot +++ b/buildroot/bin/build_release_avr_optiboot @@ -25,4 +25,4 @@ buildMulti; exitcode=$((exitcode+$?)); mv build/Multiprotocol.ino.bin ./binaries/multi-avr-txflash-aetr-CYRF6936-inv-v$MULTI_VERSION.bin; -return $exitcode; +exit $exitcode; diff --git a/buildroot/bin/build_release_orx b/buildroot/bin/build_release_orx index b68a437..a9d2739 100644 --- a/buildroot/bin/build_release_orx +++ b/buildroot/bin/build_release_orx @@ -15,10 +15,11 @@ buildMulti; exitcode=$((exitcode+$?)); mv build/Multiprotocol.ino.bin ./binaries/multi-orangerx-aetr-blue-inv-v$MULTI_VERSION.bin; +printf "\n\e[33;1mPackaging ancilliary files for v$MULTI_VERSION\e[0m"; cp Multiprotocol/Multi.txt ./binaries/Multi.txt; mkdir -p SCRIPTS/TOOLS; cp Lua_scripts/*.lua SCRIPTS/TOOLS/; cp Lua_scripts/*.txt SCRIPTS/TOOLS/; zip ./binaries/MultiLuaScripts.zip SCRIPTS/TOOLS/*; -return $exitcode; +exit $exitcode; diff --git a/buildroot/bin/build_release_stm32f1_no_debug b/buildroot/bin/build_release_stm32f1_no_debug index b9c6b67..3e1b746 100644 --- a/buildroot/bin/build_release_stm32f1_no_debug +++ b/buildroot/bin/build_release_stm32f1_no_debug @@ -113,4 +113,4 @@ buildMulti; exitcode=$((exitcode+$?)); mv build/Multiprotocol.ino.bin ./binaries/multi-stm-ppm-reta-noinv-v$MULTI_VERSION.bin; -return $exitcode; +exit $exitcode;