aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md27
-rwxr-xr-xinstall.sh7
2 files changed, 26 insertions, 8 deletions
diff --git a/README.md b/README.md
index b39aee2..e7d8b58 100644
--- a/README.md
+++ b/README.md
@@ -109,13 +109,26 @@ generic, so the bar does not lie when the application on a workspace changes.
## Colours
-This repo holds the bar; udt holds the palette. `styles/theme.css` is
-generated by `udt-palette` and gitignored, like every other generated file in
-that project.
-
-The dot scripts are bash and cannot read `@define-color`, so `install.sh`
-writes `~/.config/waybar-udt/dots.colors` for them to source. Both fall back to
-Macchiato values when it is missing, so they still run standalone.
+This repo holds the bar; udt holds the palette. The palette reaches the bar as
+three generated files, all written by this repo's `install.sh`:
+
+| File | For |
+| --- | --- |
+| `styles/theme.css` | every `@name` the stylesheets reference |
+| `dots.colors` | the two dot scripts, which are bash and cannot read `@define-color` |
+| `slackware.svg`, `slackware-light.svg` | the launcher mark, tinted for each state |
+
+All three are generated, so all three have to be rewritten when the scheme
+changes. **`udt/install.sh` calls this script** to do that, rather than
+copying the stylesheet itself: copying only `theme.css` recoloured the pills
+and left the dots and the mark on the previous scheme.
+
+So a scheme switch is still one command, `udt/install.sh`, and this script is
+what you run after editing the bar. Running it directly regenerates the
+palette first; called from udt it skips that, since udt has just done it.
+
+The dot scripts fall back to Macchiato values when `dots.colors` is missing,
+so they still run standalone.
## Layout of this repo
diff --git a/install.sh b/install.sh
index cf4965d..42bc50a 100755
--- a/install.sh
+++ b/install.sh
@@ -30,7 +30,12 @@ if [ -z "$udt" ]; then
echo " expected at $repo/../unified-desktop-theme" >&2
exit 1
fi
-"$udt/bin/udt-palette"
+
+# udt's install.sh calls this script, and it has already run udt-palette by
+# then. Running it again would be harmless but pointless, so it says so.
+if [ "${UDT_PALETTE_DONE:-}" != "1" ]; then
+ "$udt/bin/udt-palette"
+fi
install -Dm644 "$udt/templates/waybar/theme.css" "$target/styles/theme.css"
# The dot scripts are bash, not CSS, so they cannot read @define-color. Write