From 7edfb2331c2174fdb716f249c1faf01cd840a6b2 Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Sun, 10 Nov 2024 18:48:40 +0100
Subject: [PATCH] Clean build shell script

---
 compile-with-docker-all.sh | 66 --------------------------------------
 compile-with-docker.sh     | 63 +++++++++++++++++++++++++++++++++++-
 2 files changed, 62 insertions(+), 67 deletions(-)
 delete mode 100755 compile-with-docker-all.sh

diff --git a/compile-with-docker-all.sh b/compile-with-docker-all.sh
deleted file mode 100755
index 4c7160a..0000000
--- a/compile-with-docker-all.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#export DOCKER_DEFAULT_PLATFORM=linux/amd64
-IMAGE_NAME="uvk5"
-rm "${PWD}/compiled-firmware/*"
-docker build -t $IMAGE_NAME .
-
-bandscope() {
-    echo "Bandscope compilation..."
-    docker run --rm -v "${PWD}/compiled-firmware/:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "rm ./compiled-firmware/*; cd /app && make -s \
-        ENABLE_SPECTRUM=1 \
-        ENABLE_FMRADIO=0 \
-        ENABLE_AIRCOPY=1 \
-        ENABLE_NOAA=0 \
-        TARGET=f4hwn.bandscope \
-        && cp f4hwn.bandscope* compiled-firmware/"
-}
-
-broadcast() {
-    echo "Broadcast compilation..."
-    docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "cd /app && make -s \
-        ENABLE_SPECTRUM=0 \
-        ENABLE_FMRADIO=1 \
-        ENABLE_AIRCOPY=1 \
-        ENABLE_NOAA=0 \
-        TARGET=f4hwn.broadcast \
-        && cp f4hwn.broadcast* compiled-firmware/"
-}
-
-voxless() {
-    echo "Voxless compilation..."
-    docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "cd /app && make -s \
-        ENABLE_SPECTRUM=1 \
-        ENABLE_FMRADIO=1 \
-        ENABLE_VOX=0 \
-        ENABLE_AIRCOPY=0 \
-        ENABLE_AUDIO_BAR=0 \
-        ENABLE_FEAT_F4HWN_SPECTRUM=0 \
-        ENABLE_NOAA=0 \
-        ENABLE_FEAT_F4HWN_RESTORE_SCAN=0 \
-        ENABLE_FEAT_F4HWN_CHARGING_C=0 \
-        ENABLE_FEAT_F4HWN_NARROWER=0 \
-        ENABLE_FEAT_F4HWN_CONTRAST=0 \
-        TARGET=f4hwn.voxless \
-        && cp f4hwn.voxless* compiled-firmware/"
-}
-
-case "$1" in
-    bandscope)
-        bandscope
-        ;;
-    broadcast)
-        broadcast
-        ;;
-    voxless)
-        voxless
-        ;;
-    all)
-        bandscope
-        broadcast
-        voxless
-        ;;
-    *)
-        echo "Usage: $0 {bandscope|broadcast|voxless|all}"
-        exit 1
-        ;;
-esac
\ No newline at end of file
diff --git a/compile-with-docker.sh b/compile-with-docker.sh
index 7ad8490..4c7160a 100755
--- a/compile-with-docker.sh
+++ b/compile-with-docker.sh
@@ -1,5 +1,66 @@
 #!/bin/sh
 #export DOCKER_DEFAULT_PLATFORM=linux/amd64
 IMAGE_NAME="uvk5"
+rm "${PWD}/compiled-firmware/*"
 docker build -t $IMAGE_NAME .
-docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "rm ./compiled-firmware/*; cd /app && make && cp f4hwn* compiled-firmware/"
\ No newline at end of file
+
+bandscope() {
+    echo "Bandscope compilation..."
+    docker run --rm -v "${PWD}/compiled-firmware/:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "rm ./compiled-firmware/*; cd /app && make -s \
+        ENABLE_SPECTRUM=1 \
+        ENABLE_FMRADIO=0 \
+        ENABLE_AIRCOPY=1 \
+        ENABLE_NOAA=0 \
+        TARGET=f4hwn.bandscope \
+        && cp f4hwn.bandscope* compiled-firmware/"
+}
+
+broadcast() {
+    echo "Broadcast compilation..."
+    docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "cd /app && make -s \
+        ENABLE_SPECTRUM=0 \
+        ENABLE_FMRADIO=1 \
+        ENABLE_AIRCOPY=1 \
+        ENABLE_NOAA=0 \
+        TARGET=f4hwn.broadcast \
+        && cp f4hwn.broadcast* compiled-firmware/"
+}
+
+voxless() {
+    echo "Voxless compilation..."
+    docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "cd /app && make -s \
+        ENABLE_SPECTRUM=1 \
+        ENABLE_FMRADIO=1 \
+        ENABLE_VOX=0 \
+        ENABLE_AIRCOPY=0 \
+        ENABLE_AUDIO_BAR=0 \
+        ENABLE_FEAT_F4HWN_SPECTRUM=0 \
+        ENABLE_NOAA=0 \
+        ENABLE_FEAT_F4HWN_RESTORE_SCAN=0 \
+        ENABLE_FEAT_F4HWN_CHARGING_C=0 \
+        ENABLE_FEAT_F4HWN_NARROWER=0 \
+        ENABLE_FEAT_F4HWN_CONTRAST=0 \
+        TARGET=f4hwn.voxless \
+        && cp f4hwn.voxless* compiled-firmware/"
+}
+
+case "$1" in
+    bandscope)
+        bandscope
+        ;;
+    broadcast)
+        broadcast
+        ;;
+    voxless)
+        voxless
+        ;;
+    all)
+        bandscope
+        broadcast
+        voxless
+        ;;
+    *)
+        echo "Usage: $0 {bandscope|broadcast|voxless|all}"
+        exit 1
+        ;;
+esac
\ No newline at end of file