From 6c6ffc61ee273ba29f2a094e9953dbaf3df920d6 Mon Sep 17 00:00:00 2001 From: Joe Eaves Date: Tue, 22 Dec 2020 11:39:21 +0000 Subject: [PATCH] Make the post_build output a little cleaner --- docker/post_build.sh.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/post_build.sh.in b/docker/post_build.sh.in index 414fdb40..52824c5b 100755 --- a/docker/post_build.sh.in +++ b/docker/post_build.sh.in @@ -7,6 +7,7 @@ set -e export PROJECT_VERSION="@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@" mkdir -p "$OUTPUT_DIR" +cp "$SOURCES_DIR"/bootloader/bootloader-5.0.4.bin $OUTPUT_DIR/bootloader.bin "$TOOLS_DIR"/mcuboot/scripts/imgtool.py create --version 1.0.0 \ --align 4 --header-size 32 --slot-size 475136 --pad-header \ @@ -17,9 +18,9 @@ adafruit-nrfutil dfu genpkg --dev-type 0x0052 \ --application "$OUTPUT_DIR/image-$PROJECT_VERSION.bin" \ "$OUTPUT_DIR/dfu-$PROJECT_VERSION.zip" -cp "$BUILD_DIR"/src/*.bin \ - "$BUILD_DIR"/src/*.hex \ - "$BUILD_DIR"/src/*.out \ - "$BUILD_DIR"/src/*.map \ - $OUTPUT_DIR -cp "$SOURCES_DIR"/bootloader/bootloader-5.0.4.bin $OUTPUT_DIR/bootloader.bin \ No newline at end of file +pushd "$BUILD_DIR" + cp src/*.bin $OUTPUT_DIR + cp src/*.hex $OUTPUT_DIR + cp src/*.out $OUTPUT_DIR + cp src/*.map $OUTPUT_DIR +popd \ No newline at end of file