From 0f5fdfbab780e3dcdb3a957efd142d9440f52cf3 Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@tomfifield.net>
Date: Mon, 15 Jul 2024 20:11:37 +0800
Subject: [PATCH] Make mergehex executable. (#4290)

Previously, we used sudo and chmod to make mergehex executable in
our build script. This change attempts to set the executable bit
using git properties and remove the dependence on elevated
permissions.
---
 bin/build-nrf52.sh |   1 -
 bin/mergehex       | Bin
 2 files changed, 1 deletion(-)
 mode change 100644 => 100755 bin/mergehex

diff --git a/bin/build-nrf52.sh b/bin/build-nrf52.sh
index cf4ca60cb..c0658dad9 100755
--- a/bin/build-nrf52.sh
+++ b/bin/build-nrf52.sh
@@ -35,7 +35,6 @@ SRCHEX=.pio/build/$1/firmware.hex
 # if WM1110 target, merge hex with softdevice 7.3.0
 if (echo $1 | grep -q "wio-sdk-wm1110"); then
 	echo "Merging with softdevice"
-	sudo chmod +x ./bin/mergehex
 	bin/mergehex -m bin/s140_nrf52_7.3.0_softdevice.hex $SRCHEX -o .pio/build/$1/$basename.hex
 	SRCHEX=.pio/build/$1/$basename.hex
 	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
diff --git a/bin/mergehex b/bin/mergehex
old mode 100644
new mode 100755