diff --git a/build.py b/build.py index c03578e0..6d937982 100755 --- a/build.py +++ b/build.py @@ -55,7 +55,10 @@ class BuildContext: tweaks: Tweaks def output_dir(self) -> str: - return f"{self.build_root}/{self.build_id()}" + suffix = "light" + if self.flavor.dark: + suffix = "dark" + return f"{self.build_root}/{self.build_id()}-{suffix}" def build_id(self) -> str: return f"{self.theme_name}-{self.flavor.identifier}-{self.accent.identifier}-{self.size}+{self.tweaks.id() or 'default'}" diff --git a/install.py b/install.py index 95be1c8e..28ce7a4c 100644 --- a/install.py +++ b/install.py @@ -120,8 +120,11 @@ def fetch_zip(url: str) -> Optional[zipfile.ZipFile]: def add_libadwaita_links(ctx: InstallContext, rewrite: bool = False): + suffix = "light" + if ctx.flavor != "latte": + suffix = "dark" dir_name = ( - ctx.dest / f"catppuccin-{ctx.flavor}-{ctx.accent}-standard+default" / "gtk-4.0" + ctx.dest / f"catppuccin-{ctx.flavor}-{ctx.accent}-standard+default-{suffix}" / "gtk-4.0" ).absolute() gtk4_dir = (Path(os.path.expanduser("~")) / ".config" / "gtk-4.0").absolute() os.makedirs(gtk4_dir, exist_ok=True)