Merge pull request #19 from TeamDev-IP/fix-new-bundles-icon

Restore icon branding in the recent macOS bundles

Author: denys-hrulov

pkg/mac/branding.go

@@ -71,6 +71,16 @@ func (branding *MacBranding) ApplyToBundle(params *common.BrandingParams, appBun
 		if err := configureBundleIcon(appBundle, iconPath); err != nil {
 			return err
 		}
+		plistFile, err := appBundle.PlistFilePath().AsFile()
+		if err != nil {
+			return err
+		}
+		if _, err := getPlistProperty(plistFile, bundleIconNameAssetProperty); err == nil {
+			// Delete the property only in the newer Chromium bundles where it's present.
+			if err := deletePlistProperty(plistFile, bundleIconNameAssetProperty); err != nil {
+				return err
+			}
+		}
 	}
 
 	return nil
@@ -131,6 +141,8 @@ func (branding *MacBranding) ExecutableName(params *common.BrandingParams) strin
 	return "Chromium"
 }
 
+const bundleIconNameAssetProperty = "CFBundleIconName"
+
 var bundleIdProperties = []string{
 	"CFBundleIdentifier",
 }
@@ -207,10 +219,19 @@ func overrideBundleProperties(bundle ChromiumAppBundle, properties []string, val
 	return nil
 }
 
+func getPlistProperty(plist base.File, key string) (string, error) {
+	return base.ExecCommandAndGetOutput("defaults", []string{"read", plist.AbsPath().String(), key})
+}
+
 func setPlistProperty(plist base.File, key, value string) error {
 	return base.ExecCommand("defaults", []string{"write", plist.AbsPath().String(), key, "\"" + value + "\""})
 }
 
+func deletePlistProperty(plist base.File, key string) error {
+	base.ExecCommand("defaults", []string{"delete", plist.AbsPath().String(), key})
+	return nil
+}
+
 func overrideBundleName(bundle ChromiumAppBundle, name *string) error {
 	if name == nil {
 		return nil