From 977f454a371fd2b7f20addcff3fe7cad7b447edd Mon Sep 17 00:00:00 2001 From: Andres Almiray Date: Fri, 26 Aug 2022 14:59:18 +0200 Subject: [PATCH] refactor(packagers): Resolve iconPath relative to basedir --- .../java/org/jreleaser/packagers/AppImagePackagerProcessor.java | 1 + .../java/org/jreleaser/packagers/FlatpakPackagerProcessor.java | 1 + 2 files changed, 2 insertions(+) diff --git a/core/jreleaser-tools/src/main/java/org/jreleaser/packagers/AppImagePackagerProcessor.java b/core/jreleaser-tools/src/main/java/org/jreleaser/packagers/AppImagePackagerProcessor.java index 1dd6b6bf2..0ae111ab8 100644 --- a/core/jreleaser-tools/src/main/java/org/jreleaser/packagers/AppImagePackagerProcessor.java +++ b/core/jreleaser-tools/src/main/java/org/jreleaser/packagers/AppImagePackagerProcessor.java @@ -111,6 +111,7 @@ private void setupPrepare(Distribution distribution, Map props) Path iconPath = Paths.get(packager.getTemplateDirectory(), "icons", icon.getWidth() + "x" + icon.getHeight(), distribution.getExecutable().getName() + "." + iconExt); + iconPath = context.getBasedir().resolve(iconPath); if (!Files.exists(iconPath)) { // download diff --git a/core/jreleaser-tools/src/main/java/org/jreleaser/packagers/FlatpakPackagerProcessor.java b/core/jreleaser-tools/src/main/java/org/jreleaser/packagers/FlatpakPackagerProcessor.java index b1b79fe99..9e02b6c2c 100644 --- a/core/jreleaser-tools/src/main/java/org/jreleaser/packagers/FlatpakPackagerProcessor.java +++ b/core/jreleaser-tools/src/main/java/org/jreleaser/packagers/FlatpakPackagerProcessor.java @@ -169,6 +169,7 @@ private void setupPrepare(Distribution distribution, Map props) Path iconPath = Paths.get(packager.getTemplateDirectory(), "icons", icon.getWidth() + "x" + icon.getHeight(), distribution.getExecutable().getName() + "." + iconExt); + iconPath = context.getBasedir().resolve(iconPath); if (!Files.exists(iconPath)) { // download