Merge branch 'issue-328' into devel

Author: fvarrui

build.gradle

@@ -167,7 +167,7 @@ task generatePluginDescriptor(type: JavaExec, dependsOn: compileJava) {
 			'--errors',
 			'--batch-mode',
 			'--file', generatePomFileForPluginMavenPublication.destination,
-			'org.apache.maven.plugins:maven-plugin-plugin:3.6.0:descriptor',
+			'org.apache.maven.plugins:maven-plugin-plugin:3.9.0:descriptor',
 			'-Dproject.build.sourceEncoding=' + compileJava.options.encoding
 	]
 	doLast {

src/main/java/io/github/fvarrui/javapackager/utils/FileUtils.java

@@ -37,6 +37,7 @@ public class FileUtils {
 
 	/**
 	 * Creates a directory if it doesn't exist
+	 * 
 	 * @param dir Directory to be created
 	 * @return Created directory or existing one
 	 */
@@ -46,65 +47,70 @@ public static File mkdir(File dir) {
 		}
 		return dir;
 	}
-	
+
 	/**
 	 * Creates a directory inside an exiting one
+	 * 
 	 * @param parent Parent directory
-	 * @param name New directory name
+	 * @param name   New directory name
 	 * @return Created directory
 	 */
 	public static File mkdir(File parent, String name) {
 		File dir = new File(parent, name);
 		return mkdir(dir);
 	}
-	
+
 	/**
 	 * Copies a file
+	 * 
 	 * @param source Source file
-	 * @param dest Destination file
+	 * @param dest   Destination file
 	 * @throws Exception If the file cannot be copied
 	 */
 	public static void copyFileToFile(File source, File dest) throws Exception {
-		Logger.info("Copying file [" + source + "] to file [" + dest + "]");			
+		Logger.info("Copying file [" + source + "] to file [" + dest + "]");
 		try {
 			copyFile(source, dest);
 		} catch (IOException e) {
 			throw new Exception(e.getMessage(), e);
 		}
 	}
-	
+
 	/**
-	 * Copies a file inside an existing folder 
-	 * @param source File to be copied
+	 * Copies a file inside an existing folder
+	 * 
+	 * @param source     File to be copied
 	 * @param destFolder Destination folder
 	 * @throws Exception If the file cannot be copied
 	 */
 	public static void copyFileToFolder(File source, File destFolder) throws Exception {
 		copyFileToFolder(source, destFolder, false);
 	}
-	
+
 	public static void copyFileToFolder(File source, File destFolder, boolean overwrite) throws Exception {
 		Logger.info("Copying file [" + source + "] to folder [" + destFolder + "]");
 		File destFile = new File(destFolder, source.getName());
-		if (destFile.exists() && !overwrite) return;
+		if (destFile.exists() && !overwrite)
+			return;
 		try {
 			if (Platform.windows.isCurrentPlatform())
 				Files.copy(source.toPath(), destFile.toPath(), StandardCopyOption.COPY_ATTRIBUTES);
 			else {
 				CommandUtils.execute("cp", source, destFile);
-			}			
+			}
 		} catch (IOException e) {
 			throw new Exception(e.getMessage(), e);
 		}
 	}
-	
+
 	/**
 	 * Concatenates several files into a new one
-	 * @param dest Destination file
+	 * 
+	 * @param dest    Destination file
 	 * @param sources Source files array
-	 * @throws Exception If a file cannot be writen to the destination 
+	 * @throws Exception If a file cannot be writen to the destination
 	 */
-	public static void concat(File dest, File ... sources) throws Exception {
+	public static void concat(File dest, File... sources) throws Exception {
 		Logger.info("Concatenating files [" + StringUtils.join(sources, ",") + "] into file [" + dest + "]");
 		try {
 			FileOutputStream fos = new FileOutputStream(dest);
@@ -119,10 +125,11 @@ public static void concat(File dest, File ... sources) throws Exception {
 			throw new Exception("Error concatenating streams", e);
 		}
 	}
-	
+
 	public static void copyFolderToFolder(File from, File to) throws Exception {
 		Logger.info("Copying folder [" + from + "] to folder [" + to + "]");
-		if (!from.isDirectory()) throw new Exception("Source folder " + from + " is not a directory");
+		if (!from.isDirectory())
+			throw new Exception("Source folder " + from + " is not a directory");
 		try {
 			if (Platform.windows.isCurrentPlatform())
 				copyDirectoryToDirectory(from, to);
@@ -133,12 +140,15 @@ public static void copyFolderToFolder(File from, File to) throws Exception {
 			throw new Exception(e.getMessage(), e);
 		}
 	}
-	
+
 	public static void copyFolderContentToFolder(File from, File to) throws Exception {
 		Logger.info("Copying folder content [" + from + "] to folder [" + to + "]");
-		if (!from.isDirectory()) throw new Exception("Source folder " + from + " is not a directory");
-		if (!to.exists()) to.mkdirs();
-		else if (!to.isDirectory()) throw new Exception("Destination folder " + to + " is not a directory");
+		if (!from.isDirectory())
+			throw new Exception("Source folder " + from + " is not a directory");
+		if (!to.exists())
+			to.mkdirs();
+		else if (!to.isDirectory())
+			throw new Exception("Destination folder " + to + " is not a directory");
 		for (File file : from.listFiles()) {
 			if (file.isDirectory())
 				copyFolderToFolder(file, to);
@@ -149,19 +159,23 @@ public static void copyFolderContentToFolder(File from, File to) throws Exceptio
 
 	public static void moveFolderToFolder(File from, File to) throws Exception {
 		Logger.info("Moving folder [" + from + "] to folder [" + to + "]");
-		if (!from.isDirectory()) throw new Exception("Source folder " + from + " is not a directory");
-		else if (to.exists() && !to.isDirectory()) throw new Exception("Destination folder " + to + " is not a directory");
+		if (!from.isDirectory())
+			throw new Exception("Source folder " + from + " is not a directory");
+		else if (to.exists() && !to.isDirectory())
+			throw new Exception("Destination folder " + to + " is not a directory");
 		try {
 			moveDirectoryToDirectory(from, to, true);
 		} catch (IOException e) {
 			throw new Exception(e.getMessage(), e);
 		}
 	}
-	
+
 	public static void moveFolderContentToFolder(File from, File to) throws Exception {
 		Logger.info("Moving folder content [" + from + "] to folder [" + to + "]");
-		if (!from.isDirectory()) throw new Exception("Source folder " + from + " is not a directory");
-		else if (!to.isDirectory()) throw new Exception("Destination folder " + to + " is not a directory");
+		if (!from.isDirectory())
+			throw new Exception("Source folder " + from + " is not a directory");
+		else if (!to.isDirectory())
+			throw new Exception("Destination folder " + to + " is not a directory");
 		try {
 			for (File file : from.listFiles()) {
 				if (file.isDirectory())
@@ -175,29 +189,32 @@ public static void moveFolderContentToFolder(File from, File to) throws Exceptio
 	}
 
 	public static void moveFileToFolder(File from, File to) throws Exception {
-		Logger.info("Moving file [" + from + "] to folder [" + to + "]");		
-		if (!from.isFile()) throw new Exception("Source file " + from + " is not a file");
-		if (!to.exists()) to.mkdirs();
+		Logger.info("Moving file [" + from + "] to folder [" + to + "]");
+		if (!from.isFile())
+			throw new Exception("Source file " + from + " is not a file");
+		if (!to.exists())
+			to.mkdirs();
 		try {
 			moveFileToDirectory(from, to, true);
 		} catch (IOException e) {
 			throw new Exception(e.getMessage(), e);
 		}
 	}
-	
+
 	private static void copyStreamToFile(InputStream is, File dest) throws Exception {
-        try {
-        	copyInputStreamToFile(is, dest);
-        } catch (IOException ex) {
-            throw new Exception("Could not copy input stream to " + dest, ex);
-        }
+		try {
+			copyInputStreamToFile(is, dest);
+		} catch (IOException ex) {
+			throw new Exception("Could not copy input stream to " + dest, ex);
+		}
 	}
 
 	public static void copyResourceToFile(String resource, File dest, boolean unixStyleNewLines) throws Exception {
 		copyResourceToFile(resource, dest, unixStyleNewLines, null);
 	}
 
-	public static void copyResourceToFile(String resource, File dest, boolean unixStyleNewLines, File assetsDir) throws Exception  {
+	public static void copyResourceToFile(String resource, File dest, boolean unixStyleNewLines, File assetsDir)
+			throws Exception {
 		copyResourceToFile(resource, dest, assetsDir);
 		if (unixStyleNewLines) {
 			try {
@@ -207,7 +224,7 @@ public static void copyResourceToFile(String resource, File dest, boolean unixSt
 			}
 		}
 	}
-	
+
 	public static void processFileContent(File dest, Function<String, String> function) throws IOException {
 		String content = readFileToString(dest, StandardCharsets.UTF_8);
 		content = function.apply(content);
@@ -218,7 +235,7 @@ public static void copyResourceToFile(String resource, File dest) throws Excepti
 		copyResourceToFile(resource, dest, null);
 	}
 
-	public static void copyResourceToFile(String resource, File dest, File assetsDir) throws Exception  {
+	public static void copyResourceToFile(String resource, File dest, File assetsDir) throws Exception {
 		if (assetsDir != null) {
 			String rsc = resource.startsWith("/") ? resource.substring(1) : resource;
 			Path asset = assetsDir.toPath().resolve(rsc);
@@ -228,109 +245,116 @@ public static void copyResourceToFile(String resource, File dest, File assetsDir
 				return;
 			}
 		}
-		Logger.info("Copying resource [" + resource + "] to file [" + dest + "]");		
+		Logger.info("Copying resource [" + resource + "] to file [" + dest + "]");
 		copyStreamToFile(FileUtils.class.getResourceAsStream(resource), dest);
 	}
-	
+
 	public static void createSymlink(File link, File target) throws Exception {
-		Logger.info("Creating symbolic link [" + link + "] to [" + target + "]");		
-        try {
+		Logger.info("Creating symbolic link [" + link + "] to [" + target + "]");
+		try {
 			Files.createSymbolicLink(link.toPath(), target.toPath());
 		} catch (IOException e) {
 			throw new Exception("Could not create symlink " + link + " to " + target, e);
 		}
 	}
-	
+
 	public static void removeFolder(File folder) throws Exception {
-		Logger.info("Removing folder [" + folder + "]");		
+		Logger.info("Removing folder [" + folder + "]");
 		try {
-			deleteDirectory(folder);
+			if (Platform.windows.isCurrentPlatform())
+				deleteDirectory(folder);
+			else {
+				CommandUtils.execute("rm", "-fr", folder);
+			}
 		} catch (IOException e) {
-            throw new Exception("Could not remove folder " + folder, e);
+			throw new Exception("Could not remove folder " + folder, e);
 		}
 	}
-	
+
 	/**
 	 * Renames a file
-	 * @param file File to be renamed
+	 * 
+	 * @param file    File to be renamed
 	 * @param newName New file name
 	 */
 	public static void rename(File file, String newName) {
-		Logger.info("Renaming file [" + file + "] to [" + newName + "]");		
-		file.renameTo(new File(file.getParentFile(), newName)); 
+		Logger.info("Renaming file [" + file + "] to [" + newName + "]");
+		file.renameTo(new File(file.getParentFile(), newName));
 	}
-	
+
 	/**
 	 * Finds all files in folder that matches the regular expression
+	 * 
 	 * @param searchFolder Searching folder
-	 * @param regex Regular expression
-	 * @return List of found files or an empty list if nothing matches 
+	 * @param regex        Regular expression
+	 * @return List of found files or an empty list if nothing matches
 	 */
 	public static List<File> findFiles(File searchFolder, String regex) {
-		return Arrays.asList(searchFolder.listFiles((dir, name) -> Pattern.matches(regex, name)))
-				.stream()
-				.map(f -> new File(f.getName()))
-				.collect(Collectors.toList());
+		return Arrays.asList(searchFolder.listFiles((dir, name) -> Pattern.matches(regex, name))).stream()
+				.map(f -> new File(f.getName())).collect(Collectors.toList());
 	}
-	
+
 	/**
 	 * Finds the first file in folder that matches the regular expression
+	 * 
 	 * @param searchFolder Searching folder
-	 * @param regex Regular expression
-	 * @return Found file or null if nothing matches 
+	 * @param regex        Regular expression
+	 * @return Found file or null if nothing matches
 	 */
 	public static File findFirstFile(File searchFolder, String regex) {
-		return Arrays.asList(searchFolder.listFiles((dir, name) -> Pattern.matches(regex, name)))
-				.stream()
-				.map(f -> new File(f.getName()))
-				.findFirst()
-				.get();
+		return Arrays.asList(searchFolder.listFiles((dir, name) -> Pattern.matches(regex, name))).stream()
+				.map(f -> new File(f.getName())).findFirst().get();
 	}
-	
+
 	/**
 	 * Download a resource from an URL to a file
-	 * @param url URL to download
+	 * 
+	 * @param url  URL to download
 	 * @param file File to copy the downloaded resource
 	 * @throws IOException Resource cannot be copied/downloaded
 	 */
 	public static void downloadFromUrl(URL url, File file) throws IOException {
 		org.apache.commons.io.FileUtils.copyURLToFile(url, file);
 		Logger.info("File downloaded from [" + url + "] to [" + file.getAbsolutePath() + "]");
 	}
-	
+
 	/**
 	 * Download a resource from an URL to a file
-	 * @param url URL to download
+	 * 
+	 * @param url  URL to download
 	 * @param file File to copy the downloaded resource
 	 * @throws IOException Resource cannot be copied/downloaded
 	 */
 	public static void downloadFromUrl(String url, File file) throws IOException {
 		downloadFromUrl(new URL(url), file);
 	}
-	
+
 	/**
 	 * Checks if a file exists or is not null
+	 * 
 	 * @param file File
 	 * @return true if file exits, false if doesn't or is null
 	 */
 	public static boolean exists(File file) {
 		return file != null && file.exists();
 	}
-	
+
 	/**
 	 * Checks if a folder contains a file
-	 * @param folder Searching folder
+	 * 
+	 * @param folder   Searching folder
 	 * @param filename Searched file name
 	 * @return true if folder contains file
 	 */
 	public static boolean folderContainsFile(File folder, String filename) {
 		return new File(folder, filename).exists();
 	}
-	
+
 	/**
-	 * Writes String to a file in UTF-8 including BOM 
+	 * Writes String to a file in UTF-8 including BOM
+	 * 
 	 * @param output Output file
-	 * @param data Input string
+	 * @param data   Input string
 	 * @throws Exception if something goes wrong
 	 */
 	public static void writeStringToFileWithBOM(File output, String data) throws Exception {