U creates application link directly in mounted volume on mac os

Author: fvarrui

docs/macosx-specific-properties.md

@@ -3,15 +3,14 @@
 ```xml
 <macConfig>
 	<!-- general properties -->
-    	<appId>app unique identifier</appId>
+	<appId>app unique identifier</appId>
 	<icnsFile>path/to/icon.icns</icnsFile>
 	<generateDmg>true|false</generateDmg>
 	<generatePkg>true|false</generatePkg>
 	<relocateJar>true|false</relocateJar>
-	<removeApplicationLink>true|false</removeApplicationLink>
 	<!-- signing properties -->
-    	<developerId>singning identity</developerId>
-    	<entitlements>path/to/entitlements.plist</entitlements>
+	<developerId>singning identity</developerId>
+	<entitlements>path/to/entitlements.plist</entitlements>
 	<!-- properties used in DMG disk image generation -->
 	<backgroundImage>path/to/png</backgroundImage>
 	<windowX>x</windowX>
@@ -35,13 +34,10 @@
 | `generateDmg`  | :x:       | `true`         | Enables DMG disk image file generation.                      |
 | `generatePkg`  | :x:       | `true`         | Enables installation package generation.                     |
 | `relocateJar`  | :x:       | `true`         | If `true`, Jar files are located in `Contents/Resources/Java` folder, otherwise they are located in `Contents/Resources` folder. |
-|
-| `removeApplicationLink`  | :x:       | `removeApplicationLink`         | If `true`, application link in build folder shall be removed after build. |
 | `appId`        | :x:       | `${mainClass}` | App unique identifier.                                       |
 | `developerId`  | :x:       | `null`         | Signing identity.                                            |
 | `entitlements` | :x:       | `null`         | Path to [entitlements](https://developer.apple.com/documentation/bundleresources/entitlements) file. |
 
-
 ## DMG generation properties
 
 | Property          | Mandatory | Default value                   | Description                                                |

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

@@ -27,7 +27,6 @@ public class MacConfig implements Serializable {
 	private boolean generateDmg = true;
 	private boolean generatePkg = true;
 	private boolean relocateJar = true;
-	private boolean removeApplicationLink = true;
 	private String appId;
 	private String developerId = "-";
 	private File entitlements;
@@ -168,14 +167,6 @@ public void setRelocateJar(boolean relocateJar) {
 		this.relocateJar = relocateJar;
 	}
 
-	public boolean isRemoveApplicationLink() {
-		return removeApplicationLink;
-	}
-
-	public void setRemoveApplicationLink(boolean removeApplicationLink) {
-		this.removeApplicationLink = removeApplicationLink;
-	}
-
 	public String getAppId() {
 		return appId;
 	}
@@ -207,9 +198,7 @@ public String toString() {
 				+ ", iconSize=" + iconSize + ", textSize=" + textSize + ", iconX=" + iconX + ", iconY=" + iconY
 				+ ", appsLinkIconX=" + appsLinkIconX + ", appsLinkIconY=" + appsLinkIconY + ", volumeIcon=" + volumeIcon
 				+ ", volumeName=" + volumeName + ", generateDmg=" + generateDmg + ", generatePkg=" + generatePkg
-				+ ", relocateJar=" + relocateJar
-				+ ", removeApplicationLink=" + removeApplicationLink
-				+ ", appId=" + appId + ", developerId=" + developerId
+				+ ", relocateJar=" + relocateJar + ", appId=" + appId + ", developerId=" + developerId
 				+ ", entitlements=" + entitlements + "]";
 	}
 

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

@@ -59,12 +59,6 @@ public File apply(Packager packager) throws Exception {
 		// mount dir
 		File mountFolder = new File("/Volumes/" + volumeName);
 
-		// creates a symlink to Applications folder
-		Logger.info("Creating Applications link");
-		File targetFolder = new File("/Applications");
-		File linkFile = new File(appFolder, "Applications");
-		FileUtils.createSymlink(linkFile, targetFolder);
-
 		// copies background file
 		Logger.info("Copying background image");
 		File backgroundFolder = FileUtils.mkdir(appFolder, ".background");
@@ -102,7 +96,13 @@ public File apply(Packager packager) throws Exception {
 		// pause to prevent occasional "Can't get disk" (-1728) issues 
 		// https://github.com/seltzered/create-dmg/commit/5fe7802917bb85b40c0630b026d33e421db914ea
 		ThreadUtils.sleep(2000L);
-		
+
+		// creates a symlink to Applications folder
+		Logger.info("Creating Applications link");
+		File targetFolder = new File("/Applications");
+		File linkFile = new File(mountFolder, "Applications");
+		FileUtils.createSymlink(linkFile, targetFolder);
+
 		// renders applescript 
 		Logger.info("Rendering DMG customization applescript ... ");
 		File applescriptFile = new File(assetsFolder, "customize-dmg.applescript");
@@ -128,16 +128,6 @@ public File apply(Packager packager) throws Exception {
 		Logger.info("Unmounting volume: " + mountFolder);
 		execute("hdiutil", "detach", mountFolder);
 
-		// remove application link (if required)
-		boolean removeApplicationLink = macPackager.getMacConfig().isRemoveApplicationLink();
-		if (removeApplicationLink) {
-			boolean success = linkFile.delete();
-			if (success)
-				Logger.info("Application link successfully deleted");
-			else
-				Logger.info("Could not delete Application link");
-		}
-		
 		// compress image
 		Logger.info("Compressing disk image...");
 		execute("hdiutil", "convert", tempDmgFile, "-ov", "-format", "UDZO", "-imagekey", "zlib-level=9", "-o", dmgFile);