From 07dceb41534aeeb84210aa24fd3ba4e34a0037cd Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Fri, 7 May 2021 15:31:43 +0200
Subject: [PATCH] fix portable archives

---
 .github/workflows/CreateRelease.yml           | 27 ++++++++++---------
 .../Windows/resources/windows_sign_dlls.ps1   |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml
index 50c4e9660..e66d05d58 100644
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -289,10 +289,11 @@ jobs:
         chmod +x meshlab_linux_portable_double/AppRun
     - name: Create MeshLab Portable Linux Archive
       run: |
-        mv meshlab_linux_portable MeshLab${{ github.event.inputs.version }}${{steps.envs.outputs.rc_suffix}}-linux
-        tar -cvzf MeshLab${{ github.event.inputs.version }}${{steps.envs.outputs.rc_suffix}}-linux.tar.gz MeshLab${{ github.event.inputs.version }}${{steps.envs.outputs.rc_suffix}}-linux/
-        mv meshlab_linux_portable_double MeshLab${{ github.event.inputs.version }}d${{steps.envs.outputs.rc_suffix}}-linux
-        tar -cvzf MeshLab${{ github.event.inputs.version }}d${{steps.envs.outputs.rc_suffix}}-linux.tar.gz MeshLab${{ github.event.inputs.version }}d${{steps.envs.outputs.rc_suffix}}-linux/
+        cd meshlab_linux_portable
+        tar -cvzf ../MeshLab${{ github.event.inputs.version }}${{steps.envs.outputs.rc_suffix}}-linux.tar.gz *
+        cd ../meshlab_linux_portable_double
+        tar -cvzf ../MeshLab${{ github.event.inputs.version }}d${{steps.envs.outputs.rc_suffix}}-linux.tar.gz *
+        cd ..
 
 
     #Download MacOS Package
@@ -318,10 +319,11 @@ jobs:
         path: meshlab_macos_portable_double
     - name: Create MeshLab Portable MacOS
       run: |
-        mv meshlab_macos_portable MeshLab${{ github.event.inputs.version }}${{steps.envs.outputs.rc_suffix}}-macos.app
-        zip -r MeshLab${{ github.event.inputs.version }}${{steps.envs.outputs.rc_suffix}}-macos.zip MeshLab${{ github.event.inputs.version }}${{steps.envs.outputs.rc_suffix}}-macos.app/
-        mv meshlab_macos_portable_double MeshLab${{ github.event.inputs.version }}d${{steps.envs.outputs.rc_suffix}}-macos.app
-        zip -r MeshLab${{ github.event.inputs.version }}d${{steps.envs.outputs.rc_suffix}}-macos.zip MeshLab${{ github.event.inputs.version }}d${{steps.envs.outputs.rc_suffix}}-macos.app/
+        cd meshlab_macos_portable
+        zip -r ../MeshLab${{ github.event.inputs.version }}${{steps.envs.outputs.rc_suffix}}-macos.zip *
+        cd ../meshlab_macos_portable_double
+        zip -r ../MeshLab${{ github.event.inputs.version }}d${{steps.envs.outputs.rc_suffix}}-macos.zip *
+        cd ..
 
     #Download Windows Packages
     - name: Download Windows ZIP
@@ -346,10 +348,11 @@ jobs:
         path: meshlab_windows_installer_double
     - name: Create MeshLab Portable Windows Archive
       run: |
-        mv meshlab_windows_portable MeshLab${{ github.event.inputs.version }}${{steps.envs.outputs.rc_suffix}}-windows
-        zip -r MeshLab${{ github.event.inputs.version }}${{steps.envs.outputs.rc_suffix}}-windows.zip MeshLab${{ github.event.inputs.version }}${{steps.envs.outputs.rc_suffix}}-windows/
-        mv meshlab_windows_portable_double MeshLab${{ github.event.inputs.version }}d${{steps.envs.outputs.rc_suffix}}-windows
-        zip -r MeshLab${{ github.event.inputs.version }}d${{steps.envs.outputs.rc_suffix}}-windows.zip MeshLab${{ github.event.inputs.version }}d${{steps.envs.outputs.rc_suffix}}-windows/
+        cd meshlab_windows_portable
+        zip -r ../MeshLab${{ github.event.inputs.version }}${{steps.envs.outputs.rc_suffix}}-windows.zip *
+        cd ../meshlab_windows_portable_double
+        zip -r ../MeshLab${{ github.event.inputs.version }}d${{steps.envs.outputs.rc_suffix}}-windows.zip *
+        cd ..
 
 
     #Create release and upload
diff --git a/scripts/Windows/resources/windows_sign_dlls.ps1 b/scripts/Windows/resources/windows_sign_dlls.ps1
index 7b49f8207..e54fc05aa 100644
--- a/scripts/Windows/resources/windows_sign_dlls.ps1
+++ b/scripts/Windows/resources/windows_sign_dlls.ps1
@@ -4,7 +4,7 @@ if ([string]::IsNullOrEmpty($cert_path)) {
     $cert_path = Join-Path $PSScriptRoot ..\..\..\certificate\certificate.pfx
 }
 
-$files = Get-ChildItem $path -include ('*.exe', '*.dll', '*.lib') -Recurse
+$files = Get-ChildItem $path -include ('*.exe', '*.dll') -Recurse
 
 for ($i=0; $i -lt $files.Count; $i++) {
     $file = $files[$i].FullName