Merge branch 'issue-274' into devel

Author: fvarrui

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

@@ -63,6 +63,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		String jreDirectoryName = packager.getJreDirectoryName();
 		File executable = packager.getExecutable();
 		File javaFile = new File(appFolder, jreDirectoryName + "/bin/java");
+		File mimeXmlFile = packager.getMimeXmlFile();
 
 		// generates desktop file from velocity template
 		File desktopFile = new File(assetsFolder, name + ".desktop");
@@ -124,6 +125,24 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		dataProducers.add(desktopFileData);
 
+		
+		// mime.xml file data producer 
+
+		if (mimeXmlFile != null) {
+		
+			Mapper mimeXmlFileMapper = new Mapper();
+			mimeXmlFileMapper.setType("perm");
+			mimeXmlFileMapper.setPrefix("/usr/share/mime/packages");
+			
+			Data mimeXmlFileData = new Data();
+			mimeXmlFileData.setType("file");
+			mimeXmlFileData.setSrc(mimeXmlFile);
+			mimeXmlFileData.addMapper(mimeXmlFileMapper);
+			
+			dataProducers.add(mimeXmlFileData);
+			
+		}
+		
 		// java binary file data producer
 
 		if (bundleJre) {
@@ -141,18 +160,22 @@ protected File doApply(LinuxPackager packager) throws Exception {
 			dataProducers.add(javaBinaryData);
 
 			// set correct permissions on jre/lib/jspawnhelper
-			Mapper javaSpawnHelperMapper = new Mapper();
-			javaSpawnHelperMapper.setType("perm");
-			javaSpawnHelperMapper.setFileMode("755");
-			javaSpawnHelperMapper.setPrefix("/opt/" + name + "/" + jreDirectoryName + "/lib");
 
 			File jSpawnHelperFile = new File(appFolder, jreDirectoryName + "/lib/jspawnhelper");
+			
 			if (jSpawnHelperFile.exists()) {
+				
+				Mapper javaSpawnHelperMapper = new Mapper();
+				javaSpawnHelperMapper.setType("perm");
+				javaSpawnHelperMapper.setFileMode("755");
+				javaSpawnHelperMapper.setPrefix("/opt/" + name + "/" + jreDirectoryName + "/lib");
+				
 				Data javaSpawnHelperData = new Data();
 				javaSpawnHelperData.setType("file");
 				javaSpawnHelperData.setSrc(jSpawnHelperFile);
 				javaSpawnHelperData.addMapper(javaSpawnHelperMapper);
 				dataProducers.add(javaSpawnHelperData);
+				
 			}
 
 		}

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

@@ -43,6 +43,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		File assetsFolder = packager.getAssetsFolder();
 		String jreDirectoryName = packager.getJreDirectoryName();
 		Architecture arch = Architecture.valueOf(packager.getArch().getRpm());
+		File mimeXmlFile = packager.getMimeXmlFile();
 
 		// generates desktop file from velocity template
 		File desktopFile = new File(assetsFolder, name + ".desktop");
@@ -52,6 +53,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		// copies desktop file to app
 		FileUtils.copyFileToFolder(desktopFile, appFolder);
 
+		// creates RPM builder
 		Builder builder = new Builder();
 		builder.setType(RpmType.BINARY);
 		builder.setPlatform(arch, Os.LINUX);
@@ -72,11 +74,19 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		// link to desktop file
 		builder.addLink("/usr/share/applications/" + desktopFile.getName(), "/opt/" + name + "/" + 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());
+		}
+		
 		// link to binary
 		builder.addLink("/usr/local/bin/" + executable.getName(), "/opt/" + name + "/" + executable.getName());
 
+		// build RPM file
 		builder.build(outputDirectory);
 
+		// renames genewrated RPM file if created
 		String suffix = "-1." + arch.name().toLowerCase() + ".rpm";
 		File originalRpm = new File(outputDirectory, name + "-" + version + suffix);
 		File rpm = null;