Brian R. Bondy
d75c848a5e
The icon_suffix lookup in get_icon_artifacts() only matched branding == "brave", so Brave Origin packages always staged the stable product_logo PNGs regardless of channel. Brave Origin nightly ended up registering the stable Origin icon under the brave-origin-nightly icon name, making nightly indistinguishable from stable in desktop environments. Fix brave/brave-browser#54734
35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
diff --git a/chrome/installer/linux/common/installer.py b/chrome/installer/linux/common/installer.py
|
|
index 3c780c375fb9dddc93eeba12734f882abbf1aef0..31dbbe9a5569cd2bc174b74a28038f0ddc56d546 100644
|
|
--- a/chrome/installer/linux/common/installer.py
|
|
+++ b/chrome/installer/linux/common/installer.py
|
|
@@ -193,6 +193,8 @@ def gen_changelog(config: "InstallerConfig",
|
|
gzlog_dir = (
|
|
config.staging_dir /
|
|
f"usr/share/doc/{config.info_vars['PACKAGE']}-{config.channel}")
|
|
+ if config.channel == "stable":
|
|
+ gzlog_dir = (config.staging_dir / f"usr/share/doc/{config.info_vars['PACKAGE']}")
|
|
gzlog_dir.mkdir(parents=True, exist_ok=True)
|
|
gzlog = gzlog_dir / "changelog.gz"
|
|
|
|
@@ -327,6 +329,7 @@ class InstallerConfig:
|
|
logo_resources_png: str = ""
|
|
uri_scheme: str = ""
|
|
extra_desktop_entries: str = ""
|
|
+ package_and_channel: str = ""
|
|
|
|
@classmethod
|
|
def from_args(cls, args: argparse.Namespace,
|
|
@@ -681,6 +684,7 @@ class InstallerConfig:
|
|
icon_suffix = "_dev"
|
|
elif self.channel == "canary":
|
|
icon_suffix = "_canary"
|
|
+ icon_suffix = {"beta": "_beta", "dev": "_dev", "nightly": "_nightly", "unstable": "_dev"}.get(self.channel, "") if self.branding in ("brave", "brave_origin") else ""
|
|
|
|
icon_sizes = [16, 24, 32, 48, 64, 128, 256]
|
|
logo_resources_png = []
|
|
@@ -1149,3 +1153,4 @@ class Installer:
|
|
msg += f", but they were {oct(actual_perms)}"
|
|
print(msg, file=sys.stderr)
|
|
sys.exit(1)
|
|
+from brave_chromium_utils import inline_chromium_src_override; inline_chromium_src_override(globals(), locals())
|