Merge branch 'issue-419' into devel

Author: fvarrui

Diff for: src/main/java/io/github/fvarrui/javapackager/model/Arch.java

@@ -29,6 +29,15 @@ public static Arch getArch(String archString) {
 	public static Arch getDefault() {
 		return getArch(SystemUtils.OS_ARCH);
 	}
+
+	public String toDebArchitecture() {
+		switch (this) {
+		case aarch64: return "arm64";
+		case x64: return "amd64";
+		case x86: return "i386";
+		default: return null;
+		}
+	}
 
 	public Architecture toRpmArchitecture() {		
 		switch (this) {

Diff for: src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java

@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.lang3.ObjectUtils;
@@ -21,7 +22,7 @@ public class LinuxConfig implements Serializable {
 	private boolean generateAppImage = true;
 	private File pngFile;
 	private boolean wrapJar = true;
-	private File installationPath;
+	private String installationPath;
 
 	public void setCategories(List<String> categories) {
 		this.categories = categories;
@@ -71,11 +72,11 @@ public void setWrapJar(boolean wrapJar) {
 		this.wrapJar = wrapJar;
 	}
 
-	public File getInstallationPath() {
+	public String getInstallationPath() {
 		return installationPath;
 	}
 
-	public void setInstallationPath(File installationPath) {
+	public void setInstallationPath(String installationPath) {
 		this.installationPath = installationPath;
 	}
 
@@ -92,8 +93,8 @@ public String toString() {
 	 * @param packager Packager
 	 */
 	public void setDefaults(Packager packager) {
-		this.setCategories((categories == null || categories.isEmpty()) ? Arrays.asList("Utility") : categories);
-		this.setInstallationPath(ObjectUtils.defaultIfNull(installationPath, new File("/opt")));
+		this.setCategories((categories == null || categories.isEmpty()) ? Collections.singletonList("Utility") : categories);
+		this.setInstallationPath(ObjectUtils.defaultIfNull(installationPath, "/opt"));
 	}
 
 }

Diff for: src/main/java/io/github/fvarrui/javapackager/packagers/GenerateDeb.java

@@ -22,7 +22,7 @@
  */
 public class GenerateDeb extends ArtifactGenerator<LinuxPackager> {
 
-	private Console console;
+	private final Console console;
 
 	public GenerateDeb() {
 		super("DEB package");
@@ -64,8 +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);
+		String installationPath = packager.getLinuxConfig().getInstallationPath();
+		String appPath = installationPath + "/" + name;
 
 		// generates desktop file from velocity template
 		File desktopFile = new File(assetsFolder, name + ".desktop");
@@ -82,14 +82,14 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		// create data producers collections
 
-		List<DataProducer> conffilesProducers = new ArrayList<>();		
+		List<DataProducer> confFilesProducers = new ArrayList<>();
 		List<DataProducer> dataProducers = new ArrayList<>();		
 
 		// builds app folder data producer, except executable file and jre/bin/java
 
 		Mapper appFolderMapper = new Mapper();
 		appFolderMapper.setType("perm");
-		appFolderMapper.setPrefix(appPath.getAbsolutePath());
+		appFolderMapper.setPrefix(appPath);
 		appFolderMapper.setFileMode("644");
 
 		Data appFolderData = new Data();
@@ -104,7 +104,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		Mapper executableMapper = new Mapper();
 		executableMapper.setType("perm");
-		executableMapper.setPrefix(appPath.getAbsolutePath());
+		executableMapper.setPrefix(appPath);
 		executableMapper.setFileMode("755");
 
 		Data executableData = new Data();
@@ -190,7 +190,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		// builds deb file
 
-        DebMaker debMaker = new DebMaker(console, dataProducers, conffilesProducers);
+        DebMaker debMaker = new DebMaker(console, dataProducers, confFilesProducers);
         debMaker.setDeb(debFile);
         debMaker.setControl(controlFile.getParentFile());
         debMaker.setCompression("gzip");

Diff for: src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java

@@ -5,6 +5,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import org.redline_rpm.Builder;
 import org.redline_rpm.header.Architecture;
@@ -44,9 +45,9 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		String jreDirectoryName = packager.getJreDirectoryName();
 		Architecture arch = packager.getArch().toRpmArchitecture();
 		File mimeXmlFile = packager.getMimeXmlFile();
-		File installationPath = packager.getLinuxConfig().getInstallationPath();
-		File appPath = new File(installationPath, name);
-		
+		String installationPath = packager.getLinuxConfig().getInstallationPath();
+		String appPath = installationPath + "/" + name;
+
 		// generates desktop file from velocity template
 		File desktopFile = new File(assetsFolder, name + ".desktop");
 		VelocityUtils.render("linux/desktop.vtl", desktopFile, packager);
@@ -62,7 +63,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		builder.setPackage(name, version, "1");
 		builder.setPackager(organizationName);
 		builder.setDescription(description);
-		builder.setPrefixes("opt");
+		builder.setPrefixes(installationPath);
 
 		// list of files which needs execution permissions
 		List<File> executionPermissions = new ArrayList<>();
@@ -71,7 +72,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		executionPermissions.add(new File(appFolder, jreDirectoryName + "/lib/jspawnhelper"));
 
 		// add all app files
-		addDirectory(builder, installationPath.getAbsolutePath(), appFolder, executionPermissions);
+		addDirectory(builder, installationPath, appFolder, executionPermissions);
 
 		// link to desktop file
 		addLink(builder, "/usr/share/applications/" + desktopFile.getName(), appPath + "/" + desktopFile.getName());
@@ -86,13 +87,13 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		addLink(builder, "/usr/local/bin/" + executable.getName(), appPath + "/" + executable.getName());
 
 		// add all app files
-		addDirectory(builder, "/opt", appFolder, executionPermissions);
+		addDirectory(builder, installationPath, appFolder, executionPermissions);
 
 		// build RPM file
 		builder.build(outputDirectory);
 
-		// renames genewrated RPM file if created
-		String suffix = "-1." + arch.name().toLowerCase() + ".rpm";
+		// renames generated RPM file if created
+		String suffix = "-1." + arch + ".rpm";
 		File originalRpm = new File(outputDirectory, name + "-" + version + suffix);
 		File rpm = null;
 		if (originalRpm.exists()) {
@@ -119,7 +120,7 @@ private void addDirectory(Builder builder, String parentPath, File directory, Li
 		String dirPath = parentPath + "/" + directory.getName();
 		Logger.info("Adding directory '" + directory + "' to RPM builder as '" + dirPath + "'");
 		builder.addDirectory(dirPath);
-		for (File f : directory.listFiles()) {
+		for (File f : Objects.requireNonNull(directory.listFiles())) {
 			if (f.isDirectory())
 				addDirectory(builder, dirPath, f, executionPermissions);
 			else {

Diff for: src/main/resources/linux/control.vtl

@@ -2,10 +2,10 @@ Package: ${info.name}
 Version: ${info.version}
 Section: misc
 Priority: optional
-Architecture: ${info.arch.deb}
+Architecture: ${info.arch.toDebArchitecture()}
 Maintainer: ${info.organizationName} <$!{info.organizationEmail}>
 Description: ${info.description}
-Distribution: development
+Distribution: stable
 #if(${info.url})
 Homepage: ${info.url}
 #end