From 54ad5478aecf1e75d8c40ff6c63ea9995252da47 Mon Sep 17 00:00:00 2001
From: William Vinnicombe <william.vinnicombe@raspberrypi.com>
Date: Thu, 26 Sep 2024 10:25:36 +0100
Subject: [PATCH] Fix file removal

Move file removal to build.ps1
---
 build.ps1                                 | 4 ++++
 packages/windows/openocd/build-openocd.sh | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.ps1 b/build.ps1
index 8628259..49dbddc 100644
--- a/build.ps1
+++ b/build.ps1
@@ -295,5 +295,9 @@ $filename = 'openocd-{0}-{1}.zip' -f
   ($Matches.version -replace '-.*$', ''),
   $suffix
 
+# Removing files with special char in their names
+# they cause issues with some decompression libraries
+exec { Remove-Item "build\openocd-install\mingw$bitness\share\openocd\scripts\target\1986*.cfg" }
+
 Write-Host "Saving OpenOCD package to $filename"
 exec { tar -a -cf "bin\$filename" -C "build\openocd-install\mingw$bitness\bin" * -C "..\share\openocd" "scripts" }
diff --git a/packages/windows/openocd/build-openocd.sh b/packages/windows/openocd/build-openocd.sh
index e90c57a..e5a5018 100755
--- a/packages/windows/openocd/build-openocd.sh
+++ b/packages/windows/openocd/build-openocd.sh
@@ -14,7 +14,3 @@ make -j$(nproc)
 DESTDIR="$PWD/../openocd-install" make install
 cp "/mingw$BITNESS/bin/libhidapi-0.dll" "$PWD/../openocd-install/mingw$BITNESS/bin"
 cp "/mingw$BITNESS/bin/libusb-1.0.dll" "$PWD/../openocd-install/mingw$BITNESS/bin"
-
-# Removing files with special char in their names
-# they cause issues with some decompression libraries
-rm "$PWD/../openocd-install/mingw$BITNESS/scripts/target/1986*.cfg"