U refactoring

Author: fvarrui

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

@@ -265,8 +265,10 @@ public String toString() {
 				+ ", appsLinkIconX=" + appsLinkIconX + ", appsLinkIconY=" + appsLinkIconY + ", volumeIcon=" + volumeIcon
 				+ ", volumeName=" + volumeName + ", generateDmg=" + generateDmg + ", generatePkg=" + generatePkg
 				+ ", relocateJar=" + relocateJar + ", appId=" + appId + ", developerId=" + developerId
-				+ ", entitlements=" + entitlements + ", codesignApp=" + codesignApp + ", infoPlist=" + infoPlist
-				+ ", hardenedCodesign=" + hardenedCodesign + ", macStartup=" + macStartup + "]";
+				+ ", entitlements=" + entitlements + ", provisionProfile=" + provisionProfile + ", customLauncher="
+				+ customLauncher + ", customInfoPlist=" + customInfoPlist + ", codesignApp=" + codesignApp
+				+ ", infoPlist=" + infoPlist + ", hardenedCodesign=" + hardenedCodesign + ", macStartup=" + macStartup
+				+ "]";
 	}
 
 	/**

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

@@ -214,6 +214,7 @@ private void prepareEntitlementFile(File entitlements) throws Exception {
 
 	private void manualDeepSign(File appFolder, String developerCertificateName, File entitlements) throws IOException, CommandLineException {
 
+		// codesign each file in app
 		List<Object> findCommandArgs = new ArrayList<>();
 		findCommandArgs.add(appFolder);
 		findCommandArgs.add("-depth"); // execute 'codesign' in 'reverse order', i.e., deepest files first
@@ -222,43 +223,34 @@ private void manualDeepSign(File appFolder, String developerCertificateName, Fil
 		findCommandArgs.add("-exec");
 		findCommandArgs.add("codesign");
 		findCommandArgs.add("-f");
-
 		addHardenedCodesign(findCommandArgs);
-
 		findCommandArgs.add("-s");
 		findCommandArgs.add(developerCertificateName);
 		findCommandArgs.add("--entitlements");
 		findCommandArgs.add(entitlements);
 		findCommandArgs.add("{}");
 		findCommandArgs.add("\\;");
-
-		CommandUtils.execute("find", findCommandArgs.toArray(new Object[0]));
+		CommandUtils.execute("find", findCommandArgs);
 
 		// make sure the executable is signed last
-		List<Object> codeSignExe = new ArrayList<>();
-		codeSignExe.add("-f");
-		addHardenedCodesign(codeSignExe);
-		codeSignExe.add("--entitlements");
-		codeSignExe.add(entitlements);
-		codeSignExe.add("-s");
-		codeSignExe.add(developerCertificateName);
-		codeSignExe.add(this.executable);
-
-		CommandUtils.execute("codesign", codeSignExe.toArray(new Object[0]));
+		codesign(entitlements, developerCertificateName, this.executable);
 
 		// finally, sign the top level directory
-		List<Object> codeSignTopLevelDir = new ArrayList<>();
-		codeSignTopLevelDir.add("-f");
-		addHardenedCodesign(codeSignTopLevelDir);
-		codeSignTopLevelDir.add("--entitlements");
-		codeSignTopLevelDir.add(entitlements);
-		codeSignTopLevelDir.add("-s");
-		codeSignTopLevelDir.add(developerCertificateName);
-		codeSignTopLevelDir.add(appFolder);
-
-		CommandUtils.execute("codesign", codeSignTopLevelDir.toArray(new Object[0]));
+		codesign(entitlements, developerCertificateName, appFolder);
 
 	}
+	
+	private void codesign(File entitlements, String developerCertificateName, File file) throws IOException, CommandLineException {
+		List<Object> arguments = new ArrayList<>();
+		arguments.add("-f");
+		addHardenedCodesign(arguments);
+		arguments.add("--entitlements");
+		arguments.add(entitlements);
+		arguments.add("-s");
+		arguments.add(developerCertificateName);
+		arguments.add(appFolder);
+		CommandUtils.execute("codesign", arguments);
+	}
 
 	private void addHardenedCodesign(Collection<Object> args){
 		if (macConfig.isHardenedCodesign()) {

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

@@ -4,6 +4,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineException;
@@ -29,6 +30,10 @@ public static String execute(String executable, Object... arguments) throws IOEx
 		return executeOnDirectory(new File("."), executable, arguments);
 	}
 
+	public static String execute(String executable, List<Object> arguments) throws IOException, CommandLineException {
+		return executeOnDirectory(new File("."), executable, arguments.toArray(new Object[0]));
+	}
+	
 	public static ExecutionResult executeWithResult(File workingDirectory, String executable, Object... arguments) throws IOException, CommandLineException {
 		ExecutionResult result = new ExecutionResult();