Fixes in cache handling

lanthale · May 25, 2024 · 9656214 · 9656214
1 parent ec15e97
commit 9656214
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/PhotoSlide/src/main/java/org/photoslide/SoftwareUpdater.java b/PhotoSlide/src/main/java/org/photoslide/SoftwareUpdater.java
@@ -336,8 +336,8 @@ protected String call() throws Exception {
                         httpsURL = "https://github.com/lanthale/PhotoSlide/releases/download/v" + nextAppVersion + "/PhotoSlide-" + nextAppVersion + ".dmg";
                         filename = "PhotoSlide-" + nextAppVersion + ".dmg";
                     } else if (OS.contains("MAC") && architecture.equalsIgnoreCase("aarch64")) {
-                        httpsURL = "https://github.com/lanthale/PhotoSlide/releases/download/v" + nextAppVersion + "/PhotoSlide_" + "aarch_64" + "-" + nextAppVersion + ".dmg";
-                        filename = "PhotoSlide_" + "aarch_64" + "-" + nextAppVersion + ".dmg";
+                        httpsURL = "https://github.com/lanthale/PhotoSlide/releases/download/v" + nextAppVersion + "/PhotoSlide_" + architecture + "-" + nextAppVersion + ".dmg";
+                        filename = "PhotoSlide_" + architecture + "-" + nextAppVersion + ".dmg";
                     } else if (OS.contains("NUX")) {
                         httpsURL = "https://github.com/lanthale/PhotoSlide/releases/download/v" + nextAppVersion + "/PhotoSlide_" + nextAppVersion + "_amd64.deb";
                         filename = "PhotoSlide-" + nextAppVersion + ".deb";

diff --git a/PhotoSlide/src/main/resources/pkg-config/mac-jpackage.txt b/PhotoSlide/src/main/resources/pkg-config/mac-jpackage.txt
@@ -1,5 +1,5 @@
 --type dmg
---name ${app.name}_${os.detected.arch}
+--name ${app.name}
 --icon ${project.resources[0].directory}/org/photoslide/img/osx/PhotoSlide.icns
 --resource-dir ${project.resources[0].directory}/org/photoslide/img/osx/pkgresource
 --dest ${project.build.directory}