From 18ff799fb1894f1e701cde7fe54f78a01c37cc27 Mon Sep 17 00:00:00 2001
From: Michael Bucari-Tovo <mbucari1@gmail.com>
Date: Wed, 11 Jan 2023 20:34:35 -0700
Subject: [PATCH] Update build scripts

---
 .github/workflows/build-deb.yml                    | 4 ++--
 .github/workflows/build-linux.yml                  | 2 ++
 .github/workflows/build-windows.yml                | 7 +++++--
 {Source => .github/workflows/scripts}/targz2deb.sh | 1 -
 Source/AaxDecrypter/AaxDecrypter.csproj            | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)
 rename {Source => .github/workflows/scripts}/targz2deb.sh (99%)

diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml
index 22841801..e1e3db3d 100644
--- a/.github/workflows/build-deb.yml
+++ b/.github/workflows/build-deb.yml
@@ -28,8 +28,8 @@ jobs:
       - name: Build .deb
         id: deb
         run: |
-          chmod +x ./Source/targz2deb.sh
-          ./Source/targz2deb.sh "${{ env.FILE_NAME }}.tar.gz" ${{ inputs.version }}
+          chmod +x ./.github/workflows/scripts/targz2deb.sh
+          ./.github/workflows/scripts/targz2deb.sh "${{ env.FILE_NAME }}.tar.gz" ${{ inputs.version }}
       
       - name: Publish .deb
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index 73ce24dd..b9b7cf37 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -72,6 +72,8 @@ jobs:
         id: zip
         working-directory: ./Source/bin/Publish/${{ matrix.os }}-${{ matrix.release_name }}
         run: |
+          delfiles=("libmp3lame.x86.dll" "libmp3lame.x64.dll" "ffmpegaac.x86.dll" "ffmpegaac.x64.dll" "ZipExtractor.exe")
+          for n in "${delfiles[@]}"; do rm "$n"; done
           osbuild="$(echo '${{ matrix.os }}' | tr '[:upper:]' '[:lower:]')"
           artifact="Libation.${{ steps.get_version.outputs.version }}-${osbuild}-${{ matrix.release_name }}"
           echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 4ed0364a..cfac74ec 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -74,10 +74,13 @@ jobs:
       - name: Zip artifact
         id: zip
         working-directory: ./Source/bin/Publish
-        run: |
+        run: |        
+          $dir = "${{ matrix.os }}-${{ matrix.release_name }}\"
+          $delfiles = @("libmp3lame.so", "ffmpegaac.so", "glass-with-glow_256.svg", "Libation.desktop")
+          foreach ($file in $delfiles){ if (test-path $dir$file){ Remove-Item $dir$file } }
           $artifact="${{ matrix.prefix }}Libation.${{ steps.get_version.outputs.version }}-" + "${{ matrix.os }}".ToLower() + "-${{ matrix.release_name }}"
           "artifact=$artifact" >> $env:GITHUB_OUTPUT
-          Compress-Archive -Path "${{ matrix.os }}-${{ matrix.release_name }}\*" -DestinationPath "$artifact.zip"
+          Compress-Archive -Path "${dir}*" -DestinationPath "$artifact.zip"
 
       - name: Publish artifact
         uses: actions/upload-artifact@v3
diff --git a/Source/targz2deb.sh b/.github/workflows/scripts/targz2deb.sh
similarity index 99%
rename from Source/targz2deb.sh
rename to .github/workflows/scripts/targz2deb.sh
index 67c675ee..4143aef8 100644
--- a/Source/targz2deb.sh
+++ b/.github/workflows/scripts/targz2deb.sh
@@ -116,7 +116,6 @@ Version: $VERSION
 Architecture: all
 Essential: no
 Priority: optional
-Depends: ffmpeg
 Maintainer: github.com/rmcrackan
 Description: liberate your audiobooks
 " >> "$FOLDER_DEBIAN/control"
diff --git a/Source/AaxDecrypter/AaxDecrypter.csproj b/Source/AaxDecrypter/AaxDecrypter.csproj
index aaf8882c..4236ee60 100644
--- a/Source/AaxDecrypter/AaxDecrypter.csproj
+++ b/Source/AaxDecrypter/AaxDecrypter.csproj
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="AAXClean.Codecs" Version="0.3.0" />
+	  <PackageReference Include="AAXClean.Codecs" Version="0.3.1" />
 	</ItemGroup>
 
 	<ItemGroup>