src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java

*** 308,330 ****
                  "-mountroot", imagesRoot.getAbsolutePath());
          IOUtils.exec(pb, false, null, true);
  
          File mountedRoot = new File(imagesRoot.getAbsolutePath(),
                      APP_NAME.fetchFrom(params));
- 
          try {
-             // volume icon
-             File volumeIconFile = new File(mountedRoot, ".VolumeIcon.icns");
-             IOUtils.copyFile(getConfig_VolumeIcon(params),
-                     volumeIconFile);
- 
              // background image
              File bgdir = new File(mountedRoot, BACKGROUND_IMAGE_FOLDER);
              bgdir.mkdirs();
              IOUtils.copyFile(getConfig_VolumeBackground(params),
                      new File(bgdir, BACKGROUND_IMAGE));
  
              // Indicate that we want a custom icon
              // NB: attributes of the root directory are ignored
              // when creating the volume
              // Therefore we have to do this after we mount image
              String setFileUtility = findSetFileUtility();
--- 308,340 ----
                  "-mountroot", imagesRoot.getAbsolutePath());
          IOUtils.exec(pb, false, null, true);
  
          File mountedRoot = new File(imagesRoot.getAbsolutePath(),
                      APP_NAME.fetchFrom(params));
          try {
              // background image
              File bgdir = new File(mountedRoot, BACKGROUND_IMAGE_FOLDER);
              bgdir.mkdirs();
              IOUtils.copyFile(getConfig_VolumeBackground(params),
                      new File(bgdir, BACKGROUND_IMAGE));
  
+             // We will not consider setting background image and creating link 
+             // to install-dir in DMG as critical error, since it can fail in
+             // headless enviroment.
+             try {
+                 pb = new ProcessBuilder("osascript",
+                         getConfig_VolumeScript(params).getAbsolutePath());
+                 IOUtils.exec(pb);
+             } catch (IOException ex) {
+                 Log.verbose(ex);
+             }
+ 
+             // volume icon
+             File volumeIconFile = new File(mountedRoot, ".VolumeIcon.icns");
+             IOUtils.copyFile(getConfig_VolumeIcon(params),
+                     volumeIconFile);
+ 
              // Indicate that we want a custom icon
              // NB: attributes of the root directory are ignored
              // when creating the volume
              // Therefore we have to do this after we mount image
              String setFileUtility = findSetFileUtility();
*** 354,373 ****
                  }
              } else {
                  Log.verbose(I18N.getString("message.setfile.dmg"));
              }
  
-             // We will not consider setting background image and creating link to
-             // /Application folder in DMG as critical error, since it can fail in
-             // headless enviroment.
-             try {
-                 pb = new ProcessBuilder("osascript",
-                         getConfig_VolumeScript(params).getAbsolutePath());
-                 IOUtils.exec(pb);
-             } catch (IOException ex) {
-                 Log.verbose(ex);
-             }
          } finally {
              // Detach the temporary image
              pb = new ProcessBuilder(
                      hdiutil,
                      "detach",
--- 364,373 ----
*** 491,497 ****
  
      @Override
      public boolean isDefault() {
          return true;
      }
- 
  }
--- 491,496 ----