-
Notifications
You must be signed in to change notification settings - Fork 126
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
nall, desktop-ui: Account for other *nix data locations (#1688)
### Context #1575 ended up defining the `sharedData` directory on Unix-like systems as `~/.local/share` if a build prefix was not defined. This is not exactly correct; the meaning of a "shared data" directory on a Unix-like system is variously `/usr/share`, `/usr/local/share`, or else the `share` directory of a given install prefix. ### Changes This PR allows us to respect normal Unix conventions while also respecting the option to build and install with a given prefix. This is done by defining two more functions in nall's `path`: * `localSharedData()` for `/usr/local/share` * `prefixSharedData()` for `${ARES_PREFIX}/share` `sharedData()` is changed back to the old behavior and returns `/usr/share`. Then, the `locate` logic in desktop-ui (and uh, mia) is adjusted to now search (in order): 1. the prefix's shared data if the prefix exists 2. local shared data 3. system shared data
- Loading branch information
Showing
4 changed files
with
53 additions
and
3 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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