Add identifer for DMG task which will be used as application id

This is optional with a few fallbacks but is required to explicitly set an application ID

Author: gamma

src/com/inet/gradle/setup/dmg/Dmg.java

@@ -44,6 +44,8 @@ public class Dmg extends AbstractUnixSetupTask {
 
     private Color                          backgroundColor;
 
+    private String                         applicationIdentifier;
+
     private OSXCodeSign<Dmg, SetupBuilder> codeSign;
 
     private List<LocalizedResource>        welcomePages    = new ArrayList<>();
@@ -396,4 +398,26 @@ public String getBackgroundColor() {
     public void setBackgroundColor( Color backgroundColor ) {
         this.backgroundColor = backgroundColor;
     }
+
+    /**
+     * Returns an application identifier set for the DMG builder.
+     * It is being used as ID in the Info.plist
+     * @return the application identifier for macOS
+     */
+    public String getApplicationIdentifier( SetupBuilder setup ) {
+        if ( applicationIdentifier == null || applicationIdentifier.isEmpty() ) {
+            return setup.getAppIdentifier();
+        }
+        return applicationIdentifier;
+    }
+
+
+    /**
+     * Sets an application identifier for the DMG builder.
+     * It is being used as ID in the Info.plist
+     * @param the application identifier for macOS
+     */
+    public void setApplicationIdentifier( String applicationIdentifier ) {
+        this.applicationIdentifier = applicationIdentifier;
+    }
 }

src/com/inet/gradle/setup/dmg/DmgBuilder.java

@@ -35,7 +35,6 @@
 import com.inet.gradle.setup.SetupBuilder;
 import com.inet.gradle.setup.Template;
 import com.inet.gradle.setup.abstracts.AbstractBuilder;
-import com.inet.gradle.setup.abstracts.Application;
 import com.inet.gradle.setup.abstracts.DesktopStarter;
 import com.inet.gradle.setup.abstracts.LocalizedResource;
 import com.inet.gradle.setup.abstracts.Service;
@@ -153,7 +152,8 @@ private void createBinary() throws Throwable {
      */
     private void createServiceFiles() throws IOException {
 
-        Application core = new Application( setup );
+        Service core = new Service( setup );
+        core.setId( task.getApplicationIdentifier( setup ) );
 
         // Create Pre and Post install scripts
         DesktopStarter runAfter = setup.getRunAfter();

src/com/inet/gradle/setup/dmg/OSXScriptBuilder.java

@@ -11,11 +11,12 @@
 
 import com.inet.gradle.setup.Template;
 import com.inet.gradle.setup.abstracts.Application;
+import com.inet.gradle.setup.abstracts.Service;
 
 /**
  * Create scripts from templates and replace placeholders
  * according to configuration/application
- * 
+ *
  * @author gamma
  *
  */
@@ -25,7 +26,7 @@ public class OSXScriptBuilder extends Template {
 
     /**
      * Create an OSX script using the specified template
-     * 
+     *
      * @param template to create script from
      * @throws IOException in case of errors
      */
@@ -35,7 +36,7 @@ public OSXScriptBuilder( String template ) throws IOException {
 
     /**
      * Creates an instance and concatenates the script from the input lines
-     * 
+     *
      * @param script input lines
      */
     public OSXScriptBuilder( ArrayList<String> script ) {
@@ -44,7 +45,7 @@ public OSXScriptBuilder( ArrayList<String> script ) {
 
     /**
      * Create an OSX script using the specified template
-     * 
+     *
      * @param application to use for initial setup
      * @param template to create script from
      * @throws IOException in case of errors
@@ -61,9 +62,21 @@ public OSXScriptBuilder( Application application, String template ) throws IOExc
         setPlaceholder( "workingDir", application.getWorkDir() );
     }
 
+    /**
+     * Create an OSX script using the specified template
+     *
+     * @param service to use for initial setup
+     * @param template to create script from
+     * @throws IOException in case of errors
+     */
+    public OSXScriptBuilder( Service service, String template ) throws IOException {
+        this( (Application)service, template );
+        setPlaceholder( "serviceName", service.getId() );
+    }
+
     /**
      * Add another subscript. These will be inserted at the {{script}} tokens
-     * 
+     *
      * @param script to add
      */
     public void addScript( OSXScriptBuilder script ) {
@@ -72,9 +85,10 @@ public void addScript( OSXScriptBuilder script ) {
 
     /**
      * Create a string containing all subscripts
-     * 
+     *
      * @return string of all the scripts.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder();
@@ -91,10 +105,11 @@ public String toString() {
 
     /**
      * Write file and set permissions
-     * 
+     *
      * @param file to write to
      * @throws IOException that can occur
      */
+    @Override
     public void writeTo( File file ) throws IOException {
 
         try (FileWriter writer = new FileWriter( file )) {