From 405b033f5cd54185a2a883fe6e9f6ec162953350 Mon Sep 17 00:00:00 2001
From: Stef Tervelde <stef@steftervelde.nl>
Date: Wed, 12 Mar 2025 12:55:38 +0100
Subject: [PATCH] Distribution Bugfixes

[skip ci]
---
 .github/workflows/release-gradle.yml | 4 ++--
 app/build.gradle.kts                 | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-gradle.yml b/.github/workflows/release-gradle.yml
index 7ffa024f2..db7d01df5 100644
--- a/.github/workflows/release-gradle.yml
+++ b/.github/workflows/release-gradle.yml
@@ -89,12 +89,12 @@ jobs:
           - os: ubuntu-24.04-arm
             os_prefix: linux
             arch: aarch64
-            binary: processing_${{ needs.version.outputs.version }}_arm64
+            binary: ${{ vars.SNAP_NAME }}_{{ needs.version.outputs.version }}_arm64
             extension: snap
           - os: ubuntu-latest
             os_prefix: linux
             arch: x64
-            binary: processing_${{ needs.version.outputs.version }}_amd64
+            binary: ${{ vars.SNAP_NAME }}_{{ needs.version.outputs.version }}_amd64
             extension: snap
           - os: windows-latest
             os_prefix: windows
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9e66a21aa..8cd92951f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -232,9 +232,7 @@ tasks.register<Exec>("packageSnap"){
 
     val distributable = tasks.named<AbstractJPackageTask>("createDistributable").get()
     workingDir = distributable.destinationDir.dir("../").get().asFile
-
     commandLine("snapcraft")
-    commandLine("cp ${snapname}_${version}_${snaparch}.snap ${name}_${version}_${snaparch}.snap")
 }
 tasks.register<Exec>("uploadSnap"){
     onlyIf { org.gradle.internal.os.OperatingSystem.current().isLinux }
@@ -274,7 +272,9 @@ afterEvaluate{
         actions = emptyList()
     }
     tasks.named("packageDistributionForCurrentOS").configure {
-        if(compose.desktop.application.nativeDistributions.macOS.notarization.appleID.isPresent){
+        if(org.gradle.internal.os.OperatingSystem.current().isMacOsX
+            && compose.desktop.application.nativeDistributions.macOS.notarization.appleID.isPresent
+        ){
             dependsOn("notarizeDmg")
         }
         dependsOn("packageSnap", "uploadSnap")