Merge branch 'devel' into issue-395

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/model/Arch.java

@@ -1,27 +1,12 @@
 package io.github.fvarrui.javapackager.model;
 
 import org.apache.commons.lang3.SystemUtils;
+import org.redline_rpm.header.Architecture;
 
 public enum Arch {
-	aarch64("arm64", "AARCH64"), 
-	x64("amd64", "X86_64"), 
-	x86("i386", "i386");
-
-	private String deb;
-	private String rpm;
-
-	Arch(String deb, String rpm) {
-		this.deb = deb;
-		this.rpm = rpm;
-	}
-
-	public String getDeb() {
-		return deb;
-	}
-
-	public String getRpm() {
-		return rpm;
-	}
+	aarch64, 
+	x64, 
+	x86;
 
 	public static Arch getDefault() {
 		switch (SystemUtils.OS_ARCH) {
@@ -41,4 +26,13 @@ public static Arch getDefault() {
 		}
 	}
 
-}
+	public Architecture toRpmArchitecture() {
+		switch (this.toString()) {
+		case "aarch64": return Architecture.AARCH64;
+		case "x64": return Architecture.X86_64;
+		case "x86": return Architecture.I386;
+		default: return null;
+		}
+	}
+	
+}

src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java

@@ -11,6 +11,7 @@
 import org.redline_rpm.header.Os;
 import org.redline_rpm.header.RpmType;
 
+import io.github.fvarrui.javapackager.model.Arch;
 import io.github.fvarrui.javapackager.utils.FileUtils;
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
@@ -42,7 +43,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		File executable = packager.getExecutable();
 		File assetsFolder = packager.getAssetsFolder();
 		String jreDirectoryName = packager.getJreDirectoryName();
-		Architecture arch = Architecture.valueOf(packager.getArch().getRpm());
+		Architecture arch = packager.getArch().toRpmArchitecture();
 		File mimeXmlFile = packager.getMimeXmlFile();
 		File installationPath = packager.getLinuxConfig().getInstallationPath();
 		File appPath = new File(installationPath, name);