From 4309faa4fff59b7a10c5da5104a977ea5ee8d0c9 Mon Sep 17 00:00:00 2001 From: RedstoneMango Date: Tue, 23 Sep 2025 17:21:57 +0200 Subject: [PATCH 1/3] Updated appimagetool download url --- .../fvarrui/javapackager/packagers/GenerateAppImage.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateAppImage.java b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateAppImage.java index 5450e4b1..fc3bed22 100644 --- a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateAppImage.java +++ b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateAppImage.java @@ -11,9 +11,8 @@ import java.io.IOException; public class GenerateAppImage extends ArtifactGenerator { - - private static final int IMAGETOOL_VERSION = 13; - private static final String IMAGETOOL_URL = "https://github.com/AppImage/AppImageKit/releases/download/" + IMAGETOOL_VERSION + "/appimagetool-%s.AppImage"; + + private static final String IMAGETOOL_URL = "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-%s.AppImage"; public GenerateAppImage() { super("AppImage"); From c1febd3fe92a0465705458f6f5e88f9f518413a4 Mon Sep 17 00:00:00 2001 From: RedstoneMango Date: Tue, 23 Sep 2025 17:23:28 +0200 Subject: [PATCH 2/3] Added version to appimage name to reflect README correctly --- .../fvarrui/javapackager/packagers/GenerateAppImage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateAppImage.java b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateAppImage.java index fc3bed22..f242835d 100644 --- a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateAppImage.java +++ b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateAppImage.java @@ -40,12 +40,13 @@ protected File doApply(LinuxPackager packager) throws Exception { File appFolder = packager.getAppFolder(); File outputFolder = packager.getOutputDirectory(); String name = packager.getName(); + String version = packager.getVersion(); File executable = packager.getExecutable(); File assetsFolder = packager.getAssetsFolder(); File iconFile = packager.getIconFile(); // output AppImage file - File appImage = new File(outputFolder, name + ".AppImage"); + File appImage = new File(outputFolder, name + "_" + version + ".AppImage"); // AppDir folder File appDir = new File(assetsFolder, "AppDir"); From 10f25874757df435e3a819e4d3d5ebf3185c7123 Mon Sep 17 00:00:00 2001 From: RedstoneMango Date: Tue, 23 Sep 2025 17:26:12 +0200 Subject: [PATCH 3/3] fixed rpm file not being renamed after generation --- .../fvarrui/javapackager/packagers/GenerateRpm.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java index e063a645..09af46fa 100644 --- a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java +++ b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java @@ -93,7 +93,7 @@ protected File doApply(LinuxPackager packager) throws Exception { builder.build(outputDirectory); // renames generated RPM file if created - String suffix = "-1." + arch + ".rpm"; + String suffix = "-1." + getRpmArchString(arch) + ".rpm"; File originalRpm = new File(outputDirectory, name + "-" + version + suffix); File rpm = null; if (originalRpm.exists()) { @@ -129,4 +129,10 @@ private void addDirectory(Builder builder, String parentPath, File directory, Li } } + private String getRpmArchString(Architecture arch) { + if (arch == null) return "null"; + + return arch.toString().toLowerCase(); // Without Locale to match the redline_rpm way of handling conversion + } + }