From 37b124fa941373eb27e47b3b5fbac9526b494e8c Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Fri, 30 Jun 2023 17:42:08 +0100
Subject: [PATCH 01/13] velocity utils singleton

---
 .../io/github/fvarrui/javapackager/utils/VelocityUtils.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java b/src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java
index 5e5100f3..ee00d918 100644
--- a/src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java
+++ b/src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java
@@ -21,6 +21,8 @@ public class VelocityUtils {
 
 	private static File assetsDir = new File("assets");
 	private static VelocityEngine velocityEngine = null;
+	
+	private VelocityUtils() {}
 
 	private static VelocityEngine getVelocityEngine() {
 		

From 52057862846bf40802dedbb8e4da3d3ed7b1cb6d Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Fri, 30 Jun 2023 17:43:02 +0100
Subject: [PATCH 02/13] new property for template config list

---
 .../javapackager/gradle/PackageTask.java      | 14 +++++++
 .../javapackager/maven/PackageMojo.java       |  7 ++++
 .../fvarrui/javapackager/model/Template.java  | 29 +++++++++++++
 .../packagers/PackagerSettings.java           | 41 +++++++++++++++----
 4 files changed, 82 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/io/github/fvarrui/javapackager/model/Template.java

diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/PackageTask.java b/src/main/java/io/github/fvarrui/javapackager/gradle/PackageTask.java
index de430227..991df48a 100644
--- a/src/main/java/io/github/fvarrui/javapackager/gradle/PackageTask.java
+++ b/src/main/java/io/github/fvarrui/javapackager/gradle/PackageTask.java
@@ -21,6 +21,7 @@
 import io.github.fvarrui.javapackager.model.Manifest;
 import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.model.Scripts;
+import io.github.fvarrui.javapackager.model.Template;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
@@ -572,6 +573,18 @@ public Arch getArch() {
 	public void setArch(Arch arch) {
 		this.arch = arch;
 	}
+	
+	@Input
+	@Optional	
+	private List<Template> templates;
+
+	public List<Template> getTemplates() {
+		return templates;
+	}
+
+	public void setTemplates(List<Template> templates) {
+		this.templates = templates;
+	}
 
 	// ===============
 	// create packager
@@ -623,6 +636,7 @@ protected Packager createPackager() throws Exception {
 					.packagingJdk(defaultIfNull(packagingJdk, extension.getPackagingJdk(), Context.getGradleContext().getDefaultToolchain()))
 					.runnableJar(defaultIfNull(runnableJar, extension.getRunnableJar()))
 					.scripts(defaultIfNull(scripts, extension.getScripts()))
+					.templates(defaultIfNull(templates, extension.getTemplates()))
 					.useResourcesAsWorkingDir(defaultIfNull(useResourcesAsWorkingDir, extension.isUseResourcesAsWorkingDir()))
 					.url(defaultIfNull(url, extension.getUrl()))
 					.version(defaultIfNull(version, extension.getVersion(), getProject().getVersion().toString()))
diff --git a/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java b/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java
index 6ce9fe45..78d54203 100644
--- a/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java
+++ b/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java
@@ -321,6 +321,12 @@ public class PackageMojo extends AbstractMojo {
 	 */
 	@Parameter(property = "arch", required = false)
 	private Arch arch;
+	
+	/**
+	 * Templates configuration
+	 */
+	@Parameter(property = "templates", required = false)
+	private List<Template> templates;
 
 	public void execute() throws MojoExecutionException {
 		
@@ -376,6 +382,7 @@ public void execute() throws MojoExecutionException {
 						.packagingJdk(packagingJdk)
 						.runnableJar(runnableJar)
 						.scripts(scripts)
+						.templates(templates)
 						.useResourcesAsWorkingDir(useResourcesAsWorkingDir)
 						.url(url)
 						.version(version)
diff --git a/src/main/java/io/github/fvarrui/javapackager/model/Template.java b/src/main/java/io/github/fvarrui/javapackager/model/Template.java
new file mode 100644
index 00000000..8e36994d
--- /dev/null
+++ b/src/main/java/io/github/fvarrui/javapackager/model/Template.java
@@ -0,0 +1,29 @@
+package io.github.fvarrui.javapackager.model;
+
+public class Template {
+
+	private String name;
+	private boolean bom = true;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public boolean isBom() {
+		return bom;
+	}
+
+	public void setBom(boolean bom) {
+		this.bom = bom;
+	}
+
+	@Override
+	public String toString() {
+		return "Template [name=" + name + ", bom=" + bom + "]";
+	}
+
+}
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/PackagerSettings.java b/src/main/java/io/github/fvarrui/javapackager/packagers/PackagerSettings.java
index d0d96e4c..4d560031 100644
--- a/src/main/java/io/github/fvarrui/javapackager/packagers/PackagerSettings.java
+++ b/src/main/java/io/github/fvarrui/javapackager/packagers/PackagerSettings.java
@@ -15,6 +15,7 @@
 import io.github.fvarrui.javapackager.model.Manifest;
 import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.model.Scripts;
+import io.github.fvarrui.javapackager.model.Template;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
 
 /**
@@ -68,6 +69,7 @@ public class PackagerSettings {
 	protected File packagingJdk;
 	protected Scripts scripts;
 	protected Arch arch;
+	protected List<Template> templates;
 	
 	/**
 	 * Get packaging JDK
@@ -412,6 +414,14 @@ public List<FileAssociation> getFileAssociations() {
 	public Scripts getScripts() {
 		return scripts;
 	}
+	
+	/**
+	 * Get templates
+	 * @return Templates config list
+	 */
+	public List<Template> getTemplates() {
+		return templates;
+	}
 
 	// fluent api
 
@@ -862,6 +872,17 @@ public PackagerSettings scripts(Scripts scripts) {
 		this.scripts = scripts;
 		return this;
 	}
+	
+	/**
+	 * Set templates config
+	 * @param templates Templates list config
+	 * @return Packager settings
+	 */
+	public PackagerSettings templates(List<Template> templates) {
+		this.templates = templates;
+		return this;
+	}
+
 
 	// some helpful methods
 
@@ -893,10 +914,10 @@ public PackagerSettings arch(Arch arch) {
 
 	@Override
 	public String toString() {
-		return "PackagerSettings [" + "outputDirectory=" + outputDirectory + ", " + "licenseFile=" + licenseFile + ", "
-				+ "iconFile=" + iconFile + ", " + "generateInstaller=" + generateInstaller + ", " + "forceInstaller="
-				+ forceInstaller + ", " + "mainClass=" + mainClass + ", name=" + name + ", displayName=" + displayName
-				+ ", version=" + version + ", description=" + description + ", url=" + url + ", administratorRequired="
+		return "PackagerSettings [outputDirectory=" + outputDirectory + ", licenseFile=" + licenseFile + ", iconFile="
+				+ iconFile + ", generateInstaller=" + generateInstaller + ", forceInstaller=" + forceInstaller
+				+ ", mainClass=" + mainClass + ", name=" + name + ", displayName=" + displayName + ", version="
+				+ version + ", description=" + description + ", url=" + url + ", administratorRequired="
 				+ administratorRequired + ", organizationName=" + organizationName + ", organizationUrl="
 				+ organizationUrl + ", organizationEmail=" + organizationEmail + ", bundleJre=" + bundleJre
 				+ ", customizedJre=" + customizedJre + ", jrePath=" + jrePath + ", jdkPath=" + jdkPath
@@ -904,10 +925,12 @@ public String toString() {
 				+ additionalModules + ", platform=" + platform + ", envPath=" + envPath + ", vmArgs=" + vmArgs
 				+ ", runnableJar=" + runnableJar + ", copyDependencies=" + copyDependencies + ", jreDirectoryName="
 				+ jreDirectoryName + ", winConfig=" + winConfig + ", linuxConfig=" + linuxConfig + ", macConfig="
-				+ macConfig + ", createTarball=" + createTarball + ", createZipball=" + createZipball + ", extra="
-				+ extra + ", useResourcesAsWorkingDir=" + useResourcesAsWorkingDir + ", assetsDir=" + assetsDir
-				+ ", classpath=" + classpath + ", jreMinVersion=" + jreMinVersion + ", manifest=" + manifest
-				+ ", additionalModulePaths=" + additionalModulePaths + ", fileAssociations=" + fileAssociations
-				+ ", packagingJdk=" + packagingJdk + ", scripts=" + scripts + ", arch=" + arch + "]";
+				+ macConfig + ", createTarball=" + createTarball + ", tarballName=" + tarballName + ", createZipball="
+				+ createZipball + ", zipballName=" + zipballName + ", extra=" + extra + ", useResourcesAsWorkingDir="
+				+ useResourcesAsWorkingDir + ", assetsDir=" + assetsDir + ", classpath=" + classpath
+				+ ", jreMinVersion=" + jreMinVersion + ", manifest=" + manifest + ", additionalModulePaths="
+				+ additionalModulePaths + ", fileAssociations=" + fileAssociations + ", packagingJdk=" + packagingJdk
+				+ ", scripts=" + scripts + ", arch=" + arch + ", templates=" + templates + "]";
 	}
+	
 }

From 9c3de469250d01eb8385352b71b69c9df41bf23b Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Sat, 1 Jul 2023 12:10:41 +0100
Subject: [PATCH 03/13] add template configs support (default template for
 iss.vtl)

---
 .../fvarrui/javapackager/model/Template.java  |  9 +++++-
 .../javapackager/packagers/GenerateSetup.java |  2 +-
 .../javapackager/packagers/Packager.java      |  4 +--
 .../javapackager/utils/VelocityUtils.java     | 31 +++++++++++++------
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/github/fvarrui/javapackager/model/Template.java b/src/main/java/io/github/fvarrui/javapackager/model/Template.java
index 8e36994d..b06274ce 100644
--- a/src/main/java/io/github/fvarrui/javapackager/model/Template.java
+++ b/src/main/java/io/github/fvarrui/javapackager/model/Template.java
@@ -3,7 +3,14 @@
 public class Template {
 
 	private String name;
-	private boolean bom = true;
+	private boolean bom = false;
+	
+	public Template() {}
+	
+	public Template(String name, boolean bom) {
+		this.name = name;
+		this.bom = bom;
+	}
 
 	public String getName() {
 		return name;
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateSetup.java b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateSetup.java
index 801b7f91..5821da62 100644
--- a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateSetup.java
+++ b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateSetup.java
@@ -56,7 +56,7 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		
 		// generates iss file from velocity template
 		File issFile = new File(assetsFolder, name + ".iss");
-		VelocityUtils.render("windows/iss.vtl", issFile, packager, true);
+		VelocityUtils.render("windows/iss.vtl", issFile, packager);
 
 		// generates windows installer with inno setup command line compiler
 		CommandUtils.execute("iscc", "/O" + outputDirectory.getAbsolutePath(), "/F" + name + "_" + version, issFile);
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java b/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
index 3957be54..f8d045b4 100644
--- a/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
+++ b/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
@@ -101,8 +101,8 @@ private void init() throws Exception {
 			throw new Exception("'mainClass' cannot be null");
 		}
 
-		// sets assetsDir for velocity to locate custom velocity templates
-		VelocityUtils.setAssetsDir(assetsDir);
+		// init velocity utils
+		VelocityUtils.init(this);
 
 		// using name as displayName, if it's not specified
 		displayName = defaultIfBlank(displayName, name);
diff --git a/src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java b/src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java
index ee00d918..c88cc523 100644
--- a/src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java
+++ b/src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java
@@ -4,6 +4,8 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 import org.apache.velocity.Template;
@@ -14,6 +16,8 @@
 import org.apache.velocity.runtime.resource.loader.FileResourceLoader;
 import org.apache.velocity.util.StringBuilderWriter;
 
+import io.github.fvarrui.javapackager.packagers.Packager;
+
 /**
  * Velocity utils 
  */
@@ -21,8 +25,18 @@ public class VelocityUtils {
 
 	private static File assetsDir = new File("assets");
 	private static VelocityEngine velocityEngine = null;
+	private static List<io.github.fvarrui.javapackager.model.Template> templates;
 	
 	private VelocityUtils() {}
+	
+	public static void init(Packager packager) {
+		assetsDir = packager.getAssetsDir();
+		templates = packager.getTemplates() != null ? packager.getTemplates() : new ArrayList<>();
+		// add default template configs
+		if (templates.stream().noneMatch(t -> t.getName().equals("windows/iss.vtl"))) {
+			templates.add(new io.github.fvarrui.javapackager.model.Template("windows/iss.vtl", true));
+		}
+	}
 
 	private static VelocityEngine getVelocityEngine() {
 		
@@ -58,16 +72,8 @@ private static String render(String templatePath, Object info) throws Exception
 		template.merge(context, writer);		
 		return writer.toString();
 	}
-
-	public static void setAssetsDir(File assetsDir) {
-		VelocityUtils.assetsDir = assetsDir;
-	}
-
-	public static void render(String templatePath, File output, Object info) throws Exception {
-		render(templatePath, output, info, false);
-	}
 	
-	public static void render(String templatePath, File output, Object info, boolean includeBom) throws Exception {
+	private static void render(String templatePath, File output, Object info, boolean includeBom) throws Exception {
 		String data = render(templatePath, info);
 		data = StringUtils.dosToUnix(data);
 		if (!includeBom) {
@@ -76,5 +82,10 @@ public static void render(String templatePath, File output, Object info, boolean
 			FileUtils.writeStringToFileWithBOM(output, data);
 		}
 	}
-	
+
+	public static void render(String templatePath, File output, Object info) throws Exception {
+		Optional<io.github.fvarrui.javapackager.model.Template> template = templates.stream().filter(t -> t.getName().equals(templatePath)).findFirst();
+		render(templatePath, output, info, template.isPresent() ? template.get().isBom() : false);
+	}
+
 }

From e646001d2999aaf95552107fa100431de69e7452 Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Wed, 5 Jul 2023 00:40:01 +0100
Subject: [PATCH 04/13] add installationpath property for linux packages

---
 .../fvarrui/javapackager/model/LinuxConfig.java   | 15 ++++++++++++++-
 .../javapackager/packagers/GenerateDeb.java       | 14 ++++++++------
 .../javapackager/packagers/GenerateRpm.java       | 12 +++++++-----
 .../javapackager/packagers/MacPackager.java       |  5 +++++
 .../javapackager/packagers/WindowsPackager.java   |  6 ++++++
 src/main/resources/linux/desktop.vtl              |  4 ++--
 6 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java b/src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java
index 74c39b75..1066b5bf 100644
--- a/src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java
+++ b/src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java
@@ -5,6 +5,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.commons.lang3.ObjectUtils;
+
 import io.github.fvarrui.javapackager.packagers.Packager;
 
 /**
@@ -19,6 +21,7 @@ public class LinuxConfig implements Serializable {
 	private boolean generateAppImage = true;
 	private File pngFile;
 	private boolean wrapJar = true;
+	private File installationPath;
 	
 	public void setCategories(List<String> categories) {
 		this.categories = categories;
@@ -67,11 +70,20 @@ public boolean isWrapJar() {
 	public void setWrapJar(boolean wrapJar) {
 		this.wrapJar = wrapJar;
 	}
+	
+	public File getInstallationPath() {
+		return installationPath;
+	}
+	
+	public void setInstallationPath(File installationPath) {
+		this.installationPath = installationPath;
+	}
 
 	@Override
 	public String toString() {
 		return "LinuxConfig [categories=" + categories + ", generateDeb=" + generateDeb + ", generateRpm=" + generateRpm
-				+ ", generateAppImage=" + generateAppImage + ", pngFile=" + pngFile + ", wrapJar=" + wrapJar + "]";
+				+ ", generateAppImage=" + generateAppImage + ", pngFile=" + pngFile + ", wrapJar=" + wrapJar
+				+ ", installationPath=" + installationPath + "]";
 	}
 
 	/**
@@ -81,6 +93,7 @@ public String toString() {
 	 */
 	public void setDefaults(Packager packager) {
 		this.setCategories((categories == null || categories.isEmpty()) ? Arrays.asList("Utility") : categories);
+		this.setInstallationPath(ObjectUtils.defaultIfNull(installationPath, new File("/opt")));
 	}
 
 }
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateDeb.java b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateDeb.java
index ec9376e1..bbe817d6 100644
--- a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateDeb.java
+++ b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateDeb.java
@@ -64,6 +64,8 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		File executable = packager.getExecutable();
 		File javaFile = new File(appFolder, jreDirectoryName + "/bin/java");
 		File mimeXmlFile = packager.getMimeXmlFile();
+		File installationPath = packager.getLinuxConfig().getInstallationPath();
+		File appPath = new File(installationPath, name);
 
 		// generates desktop file from velocity template
 		File desktopFile = new File(assetsFolder, name + ".desktop");
@@ -87,7 +89,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		
 		Mapper appFolderMapper = new Mapper();
 		appFolderMapper.setType("perm");
-		appFolderMapper.setPrefix("/opt/" + name);
+		appFolderMapper.setPrefix(appPath.getAbsolutePath());
 		appFolderMapper.setFileMode("644");
 		
 		Data appFolderData = new Data();
@@ -102,12 +104,12 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		
 		Mapper executableMapper = new Mapper();
 		executableMapper.setType("perm");
-		executableMapper.setPrefix("/opt/" + name);
+		executableMapper.setPrefix(appPath.getAbsolutePath());
 		executableMapper.setFileMode("755");
 		
 		Data executableData = new Data();
 		executableData.setType("file");
-		executableData.setSrc(new File(appFolder.getAbsolutePath() + "/" + name));
+		executableData.setSrc(executable);
 		executableData.addMapper(executableMapper);
 
 		dataProducers.add(executableData);
@@ -150,7 +152,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 			Mapper javaBinaryMapper = new Mapper();
 			javaBinaryMapper.setType("perm");
 			javaBinaryMapper.setFileMode("755");
-			javaBinaryMapper.setPrefix("/opt/" + name + "/" + jreDirectoryName + "/bin");
+			javaBinaryMapper.setPrefix(appPath + "/" + jreDirectoryName + "/bin");
 			
 			Data javaBinaryData = new Data();
 			javaBinaryData.setType("file");
@@ -168,7 +170,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 				Mapper javaSpawnHelperMapper = new Mapper();
 				javaSpawnHelperMapper.setType("perm");
 				javaSpawnHelperMapper.setFileMode("755");
-				javaSpawnHelperMapper.setPrefix("/opt/" + name + "/" + jreDirectoryName + "/lib");
+				javaSpawnHelperMapper.setPrefix(appPath + "/" + jreDirectoryName + "/lib");
 				
 				Data javaSpawnHelperData = new Data();
 				javaSpawnHelperData.setType("file");
@@ -182,7 +184,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		
 		// symbolic link in /usr/local/bin to app binary data producer
 
-        DataProducer linkData = createLink("/usr/local/bin/" + name, "/opt/" + name + "/" + name);
+        DataProducer linkData = createLink("/usr/local/bin/" + executable.getName(), appPath + "/" + executable.getName());
         
 		dataProducers.add(linkData);
 		
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 7a2f473b..a4d5c968 100644
--- a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java
+++ b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java
@@ -44,11 +44,13 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		String jreDirectoryName = packager.getJreDirectoryName();
 		Architecture arch = Architecture.valueOf(packager.getArch().getRpm());
 		File mimeXmlFile = packager.getMimeXmlFile();
+		File installationPath = packager.getLinuxConfig().getInstallationPath();
+		File appPath = new File(installationPath, name);
 		
 		// generates desktop file from velocity template
 		File desktopFile = new File(assetsFolder, name + ".desktop");
 		VelocityUtils.render("linux/desktop.vtl", desktopFile, packager);
-		Logger.info("Rendering desktop file to " + desktopFile.getAbsolutePath());
+		Logger.info("Desktop file rendered in " + desktopFile.getAbsolutePath());
 		
 		// copies desktop file to app
 		FileUtils.copyFileToFolder(desktopFile, appFolder);
@@ -69,19 +71,19 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		executionPermissions.add(new File(appFolder, jreDirectoryName + "/lib/jspawnhelper"));
 
 		// add all app files
-		addDirectoryTree(builder, "/opt", appFolder, executionPermissions);
+		addDirectoryTree(builder, installationPath.getAbsolutePath(), appFolder, executionPermissions);
 
 		// link to desktop file
-		builder.addLink("/usr/share/applications/" + desktopFile.getName(), "/opt/" + name + "/" + desktopFile.getName());
+		builder.addLink("/usr/share/applications/" + desktopFile.getName(), appPath + "/" + desktopFile.getName());
 
 		// copy and link to mime.xml file
 		if (mimeXmlFile != null) {
 			FileUtils.copyFileToFolder(mimeXmlFile, appFolder);
-			builder.addLink("/usr/share/mime/packages/" + mimeXmlFile.getName(), "/opt/" + name + "/" + mimeXmlFile.getName());
+			builder.addLink("/usr/share/mime/packages/" + mimeXmlFile.getName(), appPath + "/" + mimeXmlFile.getName());
 		}
 		
 		// link to binary
-		builder.addLink("/usr/local/bin/" + executable.getName(), "/opt/" + name + "/" + executable.getName());
+		builder.addLink("/usr/local/bin/" + executable.getName(), appPath + "/" + executable.getName());
 
 		// build RPM file
 		builder.build(outputDirectory);
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/MacPackager.java b/src/main/java/io/github/fvarrui/javapackager/packagers/MacPackager.java
index 2ba87076..05cf90d6 100644
--- a/src/main/java/io/github/fvarrui/javapackager/packagers/MacPackager.java
+++ b/src/main/java/io/github/fvarrui/javapackager/packagers/MacPackager.java
@@ -34,6 +34,11 @@ public class MacPackager extends Packager {
 	private File javaFolder;
 	private File macOSFolder;
 	private File jreBundleFolder;
+	
+	public MacPackager() {		
+		super();
+		platform(Platform.mac);
+	}
 
 	public File getAppFile() {
 		return appFile;
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/WindowsPackager.java b/src/main/java/io/github/fvarrui/javapackager/packagers/WindowsPackager.java
index 24b02bca..1e01db8d 100644
--- a/src/main/java/io/github/fvarrui/javapackager/packagers/WindowsPackager.java
+++ b/src/main/java/io/github/fvarrui/javapackager/packagers/WindowsPackager.java
@@ -6,6 +6,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 
+import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
 
@@ -28,6 +29,11 @@ public File getMsmFile() {
 	public void setMsmFile(File msmFile) {
 		this.msmFile = msmFile;
 	}
+	
+	public WindowsPackager() {		
+		super();
+		platform(Platform.windows);
+	}
 
 	@Override
 	public void doInit() throws Exception {
diff --git a/src/main/resources/linux/desktop.vtl b/src/main/resources/linux/desktop.vtl
index a6dff25c..f7a9dd09 100644
--- a/src/main/resources/linux/desktop.vtl
+++ b/src/main/resources/linux/desktop.vtl
@@ -3,8 +3,8 @@
 Name=${info.displayName}
 GenericName=${info.displayName}
 Comment=${info.description}
-Exec=/opt/${info.name}/${info.name} %U
-Icon=/opt/${info.name}/${info.name}.png
+Exec=${info.linuxConfig.installationPath}/${info.name}/${info.executable.name} %U
+Icon=${info.linuxConfig.installationPath}/${info.name}/${info.name}.png
 Terminal=false
 Type=Application
 StartupNotify=true

From 7e8a4023bdbd47fa40a00a6461e93b233b8f94d8 Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Fri, 11 Aug 2023 15:55:52 +0100
Subject: [PATCH 05/13] Update build.gradle

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index dfd8b4e0..bda66213 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,7 +64,7 @@ dependencies {
 }
 
 group = 'io.github.fvarrui'
-version = '1.7.3'
+version = '1.7.4-SNAPSHOT'
 description = 'Hybrid Maven/Gradle plugin to package Java applications as native Windows, Mac OS X or GNU/Linux executables and create installers for them'
 
 sourceCompatibility = JavaVersion.VERSION_1_8

From f58fcbdbca4acf45a2d40130a6f22f8693ccc01e Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Thu, 17 Aug 2023 11:52:33 +0100
Subject: [PATCH 06/13] upgrade jsign to 5.0

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index bda66213..2bdadebe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 	implementation 'org.apache.commons:commons-compress:1.21'
 	implementation 'org.apache.velocity:velocity-engine-core:2.3'
 	implementation 'org.vafer:jdeb:1.9'
-	implementation 'net.jsign:jsign-core:3.1'
+	implementation 'net.jsign:jsign-core:5.0'
 	implementation 'org.redline-rpm:redline:1.2.10'
 	implementation 'edu.sc.seis.launch4j:launch4j:2.5.2'
 

From 5159edf3339603d912767d26f17d0481fe91125e Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Mon, 21 Aug 2023 17:27:16 +0100
Subject: [PATCH 07/13] Update CreateRunnableJar.java

---
 .../javapackager/maven/CreateRunnableJar.java | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/github/fvarrui/javapackager/maven/CreateRunnableJar.java b/src/main/java/io/github/fvarrui/javapackager/maven/CreateRunnableJar.java
index 1af7f5dd..e7f0c391 100644
--- a/src/main/java/io/github/fvarrui/javapackager/maven/CreateRunnableJar.java
+++ b/src/main/java/io/github/fvarrui/javapackager/maven/CreateRunnableJar.java
@@ -45,8 +45,6 @@ protected File doApply(Packager packager) {
 		File outputDirectory = packager.getOutputDirectory();
 		ExecutionEnvironment env = Context.getMavenContext().getEnv();
 		Manifest manifest = packager.getManifest();
-		String artifactId = env.getMavenProject().getArtifactId();
-		File jarFile = new File(outputDirectory, artifactId + "-" + classifier + ".jar");
 		
 		List<Element> archive = new ArrayList<>();
 		archive.add(
@@ -99,9 +97,22 @@ protected File doApply(Packager packager) {
 			
 		}
 		
-		File finalJarFile = new File(outputDirectory, name + "-" + version + "-" + classifier + ".jar");
-		FileUtils.rename(jarFile, finalJarFile.getName());		
-		return finalJarFile;
+		// gets build.finalName value
+		String finalName = Context.getMavenContext().getEnv().getMavenProject().getBuild().getFinalName();
+		
+		// creates file pointing to generated jar file
+		File finalJarFile = new File(outputDirectory, finalName + "-" + classifier + ".jar");
+		
+		// creates desired output jar file 
+		File jarFile = new File(outputDirectory, name + "-" + version + "-" + classifier + ".jar");
+		
+		// renames generated jar to desired one if they are different
+		if (!finalJarFile.equals(jarFile)) {
+			FileUtils.rename(finalJarFile, jarFile.getName());
+		}
+		
+		return jarFile;
+		
 	}
 	
 }

From 29e3f2aa268535d31291fb4ea996b02e221b6259 Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Wed, 30 Aug 2023 13:38:43 +0100
Subject: [PATCH 08/13] Update GenerateRpm.java

---
 .../io/github/fvarrui/javapackager/packagers/GenerateRpm.java   | 2 +-
 1 file changed, 1 insertion(+), 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 2c3fae77..3f4f041c 100644
--- a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java
+++ b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java
@@ -71,7 +71,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		executionPermissions.add(new File(appFolder, jreDirectoryName + "/lib/jspawnhelper"));
 
 		// add all app files
-		addDirectoryTree(builder, installationPath.getAbsolutePath(), appFolder, executionPermissions);
+		addDirectory(builder, installationPath.getAbsolutePath(), appFolder, executionPermissions);
 
 		// link to desktop file
 		addLink(builder, "/usr/share/applications/" + desktopFile.getName(), appPath + "/" + desktopFile.getName());

From 1baf2b03b3738ff8b02fc097aae508aa28d0d0d5 Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Wed, 30 Aug 2023 13:42:04 +0100
Subject: [PATCH 09/13] build fail if error occurs while copying additional
 resource

---
 .../javapackager/packagers/Packager.java      | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java b/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
index f8d045b4..cabe2c67 100644
--- a/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
+++ b/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
@@ -205,26 +205,23 @@ public void resolveResources() throws Exception {
 	 * @param resources   List of files and folders to be copied
 	 * @param destination Destination folder. All specified resources will be copied
 	 *                    here
+	 * @throws Exception 
 	 */
-	protected void copyAdditionalResources(List<File> resources, File destination) {
+	protected void copyAdditionalResources(List<File> resources, File destination) throws Exception {
 
 		Logger.infoIndent("Copying additional resources");
 
-		resources.stream().forEach(r -> {
+		for (File r : resources) {
 			if (!r.exists()) {
 				Logger.warn("Additional resource " + r + " doesn't exist");
 				return;
 			}
-			try {
-				if (r.isDirectory()) {
-					FileUtils.copyFolderToFolder(r, destination);
-				} else if (r.isFile()) {
-					FileUtils.copyFileToFolder(r, destination);
-				}
-			} catch (Exception e) {
-				Logger.error(e.getMessage(), e);
+			if (r.isDirectory()) {
+				FileUtils.copyFolderToFolder(r, destination);
+			} else if (r.isFile()) {
+				FileUtils.copyFileToFolder(r, destination);
 			}
-		});
+		}
 
 		// copy bootstrap script
 		if (FileUtils.exists(getScripts().getBootstrap())) {

From 9b7041f8eebe68e39fb839e5b4592d0e28da0c34 Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Wed, 30 Aug 2023 13:45:14 +0100
Subject: [PATCH 10/13] Update Packager.java

---
 .../io/github/fvarrui/javapackager/packagers/Packager.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java b/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
index cabe2c67..2cac8daa 100644
--- a/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
+++ b/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
@@ -214,9 +214,7 @@ protected void copyAdditionalResources(List<File> resources, File destination) t
 		for (File r : resources) {
 			if (!r.exists()) {
 				Logger.warn("Additional resource " + r + " doesn't exist");
-				return;
-			}
-			if (r.isDirectory()) {
+			} else if (r.isDirectory()) {
 				FileUtils.copyFolderToFolder(r, destination);
 			} else if (r.isFile()) {
 				FileUtils.copyFileToFolder(r, destination);

From d86e00f097e5cfabbef6cbef66244f0ac8bc123a Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Wed, 30 Aug 2023 13:53:16 +0100
Subject: [PATCH 11/13] Update Packager.java

---
 .../java/io/github/fvarrui/javapackager/packagers/Packager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java b/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
index 2cac8daa..0eb1173a 100644
--- a/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
+++ b/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
@@ -213,7 +213,7 @@ protected void copyAdditionalResources(List<File> resources, File destination) t
 
 		for (File r : resources) {
 			if (!r.exists()) {
-				Logger.warn("Additional resource " + r + " doesn't exist");
+				throw new Exception("Additional resource " + r + " doesn't exist");
 			} else if (r.isDirectory()) {
 				FileUtils.copyFolderToFolder(r, destination);
 			} else if (r.isFile()) {

From 278ab7a425f2eb079d0c52f531f301e00c5befad Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Wed, 30 Aug 2023 13:56:54 +0100
Subject: [PATCH 12/13] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c7accbd2..e5a8d591 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # JavaPackager
 
-[![Maven Central](http://img.shields.io/maven-central/v/io.github.fvarrui/javapackager)](https://central.sonatype.com/artifact/io.github.fvarrui/javapackager/1.7.3)
+[![Maven Central](http://img.shields.io/maven-central/v/io.github.fvarrui/javapackager)](https://central.sonatype.com/search?smo=true&q=a%3Ajavapackager+g%3Aio.github.fvarrui)
 [![GPL-3.0](https://img.shields.io/badge/license-GPL--3.0-%250778B9.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 
 JavaPackager is a hybrid plugin for **Maven** and **Gradle** which provides an easy way to package Java applications in native Windows, MacOS or GNU/Linux executables, and generate installers for them.

From 1a672bbdfc0586ca1db19fb51831b2e8541621c9 Mon Sep 17 00:00:00 2001
From: fvarrui <4354486+fvarrui@users.noreply.github.com>
Date: Wed, 30 Aug 2023 13:57:00 +0100
Subject: [PATCH 13/13] v1.7.4

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2bdadebe..113e7df6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,7 +64,7 @@ dependencies {
 }
 
 group = 'io.github.fvarrui'
-version = '1.7.4-SNAPSHOT'
+version = '1.7.4'
 description = 'Hybrid Maven/Gradle plugin to package Java applications as native Windows, Mac OS X or GNU/Linux executables and create installers for them'
 
 sourceCompatibility = JavaVersion.VERSION_1_8