From 2760a80879345ea71758b5579846e37de03da7d3 Mon Sep 17 00:00:00 2001
From: JaxxMoss <j.d.malotaux@gmail.com>
Date: Fri, 9 May 2025 01:05:58 +0200
Subject: [PATCH] Update build scripts, moved cleanup to .yml

---
 .github/workflows/windows-release.yml | 21 +++++++++++++++++----
 build-scripts/windows-build.bat       | 25 +------------------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/windows-release.yml b/.github/workflows/windows-release.yml
index be11940..69b13c2 100644
--- a/.github/workflows/windows-release.yml
+++ b/.github/workflows/windows-release.yml
@@ -32,11 +32,24 @@ jobs:
         shell: cmd
         run: .\build-scripts\windows-build.bat
 
-      - name: Cleanup build-scripts directory
-        shell: bash
+      - name: Cleanup root directory
+        shell: pwsh
         run: |
-          echo "Removing build-scripts directory..."
-          rmdir /s /q build-scripts
+          $folders = @("app", "ui", "build-scripts")
+          foreach ($folder in $folders) {
+            if (Test-Path $folder) {
+              Remove-Item -Recurse -Force -Path $folder
+              Write-Output "Removed development folder: $folder"
+            } else {
+              Write-Output "$folder does not exist"
+            }
+          }
+
+          # Delete all files except: Macrame.exe, favicon.ico, README.md
+          Get-ChildItem -File | Where-Object { $_.Name -notin @("Macrame.exe", "favicon.ico", "README.md") } | ForEach-Object {
+            Write-Output "Deleting file: $($_.Name)"
+            Remove-Item -Force $_.FullName
+          }
 
       - name: Commit and push build artifacts
         shell: bash
diff --git a/build-scripts/windows-build.bat b/build-scripts/windows-build.bat
index 67cf822..9e5a687 100644
--- a/build-scripts/windows-build.bat
+++ b/build-scripts/windows-build.bat
@@ -31,27 +31,4 @@ IF %ERRORLEVEL% NEQ 0 (
     exit /b %ERRORLEVEL%
 )
 
-cd ..
-
-REM Step 3: Cleanup root directory of build files.
-echo Cleaning up root directory...
-
-IF EXIST app (
-    echo Deleting app directory...
-    rmdir /s /q app
-)
-
-IF EXIST ui (
-    echo Deleting ui directory...
-    rmdir /s /q ui
-)
-
-for %%F in (*) do (
-    set "file=%%~nxF"
-    if /I not "!file!"=="Macrame.exe" if /I not "!file!"=="favicon.ico" if /I not "!file!"=="README.md" (
-        echo Deleting !file!
-        del /f /q "%%F"
-    )
-)
-
-echo Build and cleanup complete.
+echo Build complete.