refine zipping

Author: davegarthsimpson

.github/workflows/build.yml

@@ -445,7 +445,7 @@ jobs:
           # https://stackoverflow.com/questions/17927895/automate-extended-validation-ev-code-signing-with-safenet-etoken
         run: |
           shopt -s nullglob
-          for ARTIFACT in "${{ env.BUILD_ARTIFACTS_PATH }}"/*_unsigned.{exe,zip,msi}; do
+          for ARTIFACT in "${{ env.BUILD_ARTIFACTS_PATH }}"/*_unsigned.{exe,msi}; do
             echo "Processing $ARTIFACT"
             FILENAME=$(basename "$ARTIFACT")
             BASE_NAME="${FILENAME%.*}"
@@ -472,23 +472,25 @@ jobs:
         run: |
           @echo off
           setlocal enabledelayedexpansion
-          
+
           for /r %%i in (*_unsigned.zip) do (
             set "zipfile=%%i"
             goto :break
           )
           :break
-          
+
           set "dirname=!zipfile:_unsigned.zip=!"
           set "newzipfile=!dirname!.zip"
-          
+
           mkdir "!dirname!"
           tar -xf "!zipfile!" -C "!dirname!"
           
-          "%SIGNTOOL_PATH%" sign -d "Arduino IDE" -f "%INSTALLER_CERT_WINDOWS_CER%" -csp "eToken Base Cryptographic Provider" -k "%CERT_PASSWORD%" -fd sha256 -tr http://timestamp.digicert.com -td SHA256 -v "!dirname!\Arduino IDE.exe"
-          
-          tar -a -cf "!newzipfile!" "!dirname!"
-          
+          "%SIGNTOOL_PATH%" sign -d "Arduino IDE" -f "%INSTALLER_CERT_WINDOWS_CER%" -csp "eToken Base Cryptographic Provider" -k "%CERT_PASSWORD%" -kc "%CONTAINER_NAME%" -fd sha256 -tr http://timestamp.digicert.com -td SHA256 -v "!dirname!\Arduino IDE.exe"
+
+          cd "!dirname!"
+          tar -a -cf "../!newzipfile!" .
+          cd ..
+
           rmdir /s /q "!dirname!"
 
       - name: Upload signed EXE
@@ -503,7 +505,6 @@ jobs:
           name: Windows_X86-64_MSI
           path: ${{ env.BUILD_ARTIFACTS_PATH }}/*Windows_64bit.msi
 
-
       - name: Upload signed ZIP
         uses: actions/upload-artifact@v3
         with: