Mirror the settings-owned helpers into /usr/share/omarchy/bin - #260
Open
omarchybot wants to merge 1 commit into
Open
Mirror the settings-owned helpers into /usr/share/omarchy/bin#260omarchybot wants to merge 1 commit into
omarchybot wants to merge 1 commit into
Conversation
The router resolves its own directory from BASH_SOURCE[0] and globs it for omarchy-* binaries, so /usr/share/omarchy/bin has to carry every command. The omarchy package links each binary it ships into that tree and skips omarchy-debug, omarchy-debug-idle and omarchy-upload-log because they come from omarchy-settings; omarchy-settings then installed them into /usr/bin alone. A router reached through the share tree therefore routed every command except those three, and they were missing from `omarchy commands --all`. The upgrade path makes that reachable: omarchy-upgrade-to-quattro points the legacy ~/.local/share/omarchy at /usr/share/omarchy precisely because upgraded sessions still carry $OMARCHY_PATH/bin early in PATH, and several shipped commands prepend that directory themselves. The dev recipe pair carries the same asymmetry, so it gets the same links. Co-Authored-By: Codex XHigh <codex@openai.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes omacom/omarchy#9373. Closes omacom/omarchy#9401.
omarchy debuganswersUnknown Omarchy command, andomarchy commands --alllists no debug command, while/usr/bin/omarchy-debugis present, executable and correctly annotated.bin/omarchysetsOMARCHY_BIN_DIRfrom$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)and globs that directory, so/usr/share/omarchy/binhas to mirror everyomarchy-*binary for a router invoked through it. Theomarchyrecipe links each binary it ships into the share tree and skipsomarchy-debug,omarchy-debug-idleandomarchy-upload-log, because those ship fromomarchy-settingsfor the ISO and recovery flows.omarchy-settingsthen installed them into/usr/binonly. The mirror is therefore complete except for exactly those three, and a router reached through it routes everything else.That path is reachable on upgraded machines rather than fresh ones, which is why it reads as a 4.0.x regression:
omarchy-upgrade-to-quattrorepoints the legacy~/.local/share/omarchyat/usr/share/omarchyspecifically because upgraded sessions still carry$OMARCHY_PATH/binearly inPATH, andomarchy-apply-hardware,omarchy-apply-system,omarchy-channel-setand the two Chromium host helpers prepend that directory themselves.omarchy-settings-devcarries the same asymmetry againstomarchy-dev, so it gets the same three links. Itspkgveris git-describe derived and moves on every build; the stable pair does not, so an installed4.0.2-1will not be offered a rebuilt4.0.2-1. Getting this to users needsomarchy-pkgs release --rebuild, which bumpspkgrelacross both stable recipes in the lockstepguard_lockstepenforces — a release call, so it is left to you rather than hand-edited here.Reviewed by Codex at xhigh, which confirmed there is no pacman file conflict (both packages may own the directory; the three links are owned only here), no dangling-link state in any install order, and no ISO or install-detection code keyed on that directory. It raised the
pkgrelconsequence and the dev-recipe gap; the dev recipe is fixed in this change and thepkgrelbump is left to the release tooling. It also notesdocs/file-layout.md:68-72in the omarchy repo still describes these three as/usr/bin-only.One caveat worth stating plainly: the share-tree route explains the reported symptom, but neither reporter’s raw invoked path is known. If
type -a omarchyon an affected machine shows/usr/bin/omarchyand nothing earlier, something else is going on and this fix does not cover it.