From 5cdd3f6e6f0abf439da0389b38ebc13bd30fc8e5 Mon Sep 17 00:00:00 2001
From: Joe Eaves <jinux@alluha.net>
Date: Tue, 22 Dec 2020 12:40:21 +0000
Subject: [PATCH] Improve the post_build again, again?

---
 docker/post_build.sh.in | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/docker/post_build.sh.in b/docker/post_build.sh.in
index 52824c5b..53ae343a 100755
--- a/docker/post_build.sh.in
+++ b/docker/post_build.sh.in
@@ -1,12 +1,13 @@
 #!/bin/sh
 export LC_ALL=C.UTF-8
 export LANG=C.UTF-8
-set -x
 set -e
+set +x
 
 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 \
@@ -18,9 +19,11 @@ adafruit-nrfutil dfu genpkg --dev-type 0x0052 \
     --application "$OUTPUT_DIR/image-$PROJECT_VERSION.bin" \
     "$OUTPUT_DIR/dfu-$PROJECT_VERSION.zip"
 
-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
+mkdir -p "$OUTPUT_DIR/src"
+cd "$BUILD_DIR"
+cp src/*.bin "$OUTPUT_DIR/src"
+cp src/*.hex "$OUTPUT_DIR/src"
+cp src/*.out "$OUTPUT_DIR/src"
+cp src/*.map "$OUTPUT_DIR/src"
+
+ls -RUv1 "$OUTPUT_DIR" | sed 's;^\([^/]\); \1;g'
\ No newline at end of file