Merge branch 'issue-316' into devel

Author: fvarrui

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

@@ -68,21 +68,21 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		executionPermissions.add(new File(appFolder, jreDirectoryName + "/bin/java"));
 		executionPermissions.add(new File(appFolder, jreDirectoryName + "/lib/jspawnhelper"));
 
-		// add all app files
-		addDirectoryTree(builder, "/opt", appFolder, executionPermissions);
-
 		// link to desktop file
-		builder.addLink("/usr/share/applications/" + desktopFile.getName(), "/opt/" + name + "/" + desktopFile.getName());
+		addLink(builder, "/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());
+			addLink(builder, "/usr/share/mime/packages/" + mimeXmlFile.getName(), "/opt/" + name + "/" + mimeXmlFile.getName());
 		}
 
 		// link to binary
-		builder.addLink("/usr/local/bin/" + executable.getName(), "/opt/" + name + "/" + executable.getName());
+		addLink(builder, "/usr/local/bin/" + executable.getName(), "/opt/" + name + "/" + executable.getName());
 
+		// add all app files
+		addDirectory(builder, "/opt", appFolder, executionPermissions);
+		
 		// build RPM file
 		builder.build(outputDirectory);
 
@@ -98,15 +98,27 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		return rpm;
 	}
+
+	private void addLink(Builder builder, String path, String target) throws NoSuchAlgorithmException, IOException {
+		Logger.info("Adding link '" + path + "' to RPM builder targeting '" + target + "'");		
+		builder.addLink(path, target);
+	}
+	
+	private void addFile(Builder builder, String rootPath, File file, int mode) throws NoSuchAlgorithmException, IOException {		
+		String filePath = rootPath + "/" + file.getName();
+		Logger.info("Adding file '" + file + "' to RPM builder as '" + filePath + "'");
+		builder.addFile(filePath, file, mode);
+	}
 
-	private void addDirectoryTree(Builder builder, String parentPath, File root, List<File> executionPermissions) throws NoSuchAlgorithmException, IOException {
-		String rootPath = parentPath + "/" + root.getName();
-		builder.addDirectory(rootPath);
-		for (File f : root.listFiles()) {
+	private void addDirectory(Builder builder, String parentPath, File directory, List<File> executionPermissions) throws NoSuchAlgorithmException, IOException {
+		String dirPath = parentPath + "/" + directory.getName();
+		Logger.info("Adding directory '" + directory + "' to RPM builder as '" + dirPath + "'");
+		builder.addDirectory(dirPath);
+		for (File f : directory.listFiles()) {
 			if (f.isDirectory())
-				addDirectoryTree(builder, parentPath + "/" + root.getName(), f, executionPermissions);
+				addDirectory(builder, dirPath, f, executionPermissions);
 			else {
-				builder.addFile(rootPath + "/" + f.getName(), f, executionPermissions.contains(f) ? 0755 : 0644);
+				addFile(builder, dirPath, f, executionPermissions.contains(f) ? 0755 : 0644);
 			}
 		}
 	}