Skip to content

Commit 1409556

Browse files
adrgadrg
authored
Merge pull request #97 from adrg/macos-additional-search-paths
Add more data and config search paths on macOS
2 parents 0d710b1 + 1d38818 commit 1409556

File tree

3 files changed

+22
-14
lines changed

3 files changed

+22
-14
lines changed

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,16 @@ Sensible fallback locations are used for the folders which are not set.
7171
<summary><strong>Unix-like operating systems</strong></summary>
7272
<br/>
7373

74-
| <a href="#xdg-base-directory"><img width="400" height="0"></a> | <a href="#xdg-base-directory"><img width="500" height="0"></a><p>Unix</p> | <a href="#xdg-base-directory"><img width="600" height="0"></a><p>macOS</p> | <a href="#xdg-base-directory"><img width="500" height="0"></a><p>Plan 9</p> |
75-
| :------------------------------------------------------------: | :-----------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------: |
76-
| <kbd><b>XDG_DATA_HOME</b></kbd> | <kbd>~/.local/share</kbd> | <kbd>~/Library/Application&nbsp;Support</kbd> | <kbd>$home/lib</kbd> |
77-
| <kbd><b>XDG_DATA_DIRS</b></kbd> | <kbd>/usr/local/share</kbd><br/><kbd>/usr/share</kbd> | <kbd>/Library/Application&nbsp;Support</kbd> | <kbd>/lib</kbd> |
78-
| <kbd><b>XDG_CONFIG_HOME</b></kbd> | <kbd>~/.config</kbd> | <kbd>~/Library/Application&nbsp;Support</kbd> | <kbd>$home/lib</kbd> |
79-
| <kbd><b>XDG_CONFIG_DIRS</b></kbd> | <kbd>/etc/xdg</kbd> | <kbd>~/Library/Preferences</kbd><br/><kbd>/Library/Application&nbsp;Support</kbd><br/><kbd>/Library/Preferences</kbd> | <kbd>/lib</kbd> |
80-
| <kbd><b>XDG_STATE_HOME</b></kbd> | <kbd>~/.local/state</kbd> | <kbd>~/Library/Application&nbsp;Support</kbd> | <kbd>$home/lib/state</kbd> |
81-
| <kbd><b>XDG_CACHE_HOME</b></kbd> | <kbd>~/.cache</kbd> | <kbd>~/Library/Caches</kbd> | <kbd>$home/lib/cache</kbd> |
82-
| <kbd><b>XDG_RUNTIME_DIR</b></kbd> | <kbd>/run/user/UID</kbd> | <kbd>~/Library/Application&nbsp;Support</kbd> | <kbd>/tmp</kbd> |
83-
| <kbd><b>XDG_BIN_HOME</b></kbd> | <kbd>~/.local/bin</kbd> | <kbd>~/.local/bin</kbd> | <kbd>$home/bin</kbd> |
74+
| <a href="#xdg-base-directory"><img width="400" height="0"></a> | <a href="#xdg-base-directory"><img width="500" height="0"></a><p>Unix</p> | <a href="#xdg-base-directory"><img width="600" height="0"></a><p>macOS</p> | <a href="#xdg-base-directory"><img width="500" height="0"></a><p>Plan 9</p> |
75+
| :------------------------------------------------------------: | :-----------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------: |
76+
| <kbd><b>XDG_DATA_HOME</b></kbd> | <kbd>~/.local/share</kbd> | <kbd>~/Library/Application&nbsp;Support</kbd> | <kbd>$home/lib</kbd> |
77+
| <kbd><b>XDG_DATA_DIRS</b></kbd> | <kbd>/usr/local/share</kbd><br/><kbd>/usr/share</kbd> | <kbd>/Library/Application&nbsp;Support</kbd><kbd>~/.local/share</kbd> | <kbd>/lib</kbd> |
78+
| <kbd><b>XDG_CONFIG_HOME</b></kbd> | <kbd>~/.config</kbd> | <kbd>~/Library/Application&nbsp;Support</kbd> | <kbd>$home/lib</kbd> |
79+
| <kbd><b>XDG_CONFIG_DIRS</b></kbd> | <kbd>/etc/xdg</kbd> | <kbd>~/Library/Preferences</kbd><br/><kbd>/Library/Application&nbsp;Support</kbd><br/><kbd>/Library/Preferences</kbd><br/><kbd>&#126;/.config</kbd> | <kbd>/lib</kbd> |
80+
| <kbd><b>XDG_STATE_HOME</b></kbd> | <kbd>~/.local/state</kbd> | <kbd>~/Library/Application&nbsp;Support</kbd> | <kbd>$home/lib/state</kbd> |
81+
| <kbd><b>XDG_CACHE_HOME</b></kbd> | <kbd>~/.cache</kbd> | <kbd>~/Library/Caches</kbd> | <kbd>$home/lib/cache</kbd> |
82+
| <kbd><b>XDG_RUNTIME_DIR</b></kbd> | <kbd>/run/user/UID</kbd> | <kbd>~/Library/Application&nbsp;Support</kbd> | <kbd>/tmp</kbd> |
83+
| <kbd><b>XDG_BIN_HOME</b></kbd> | <kbd>~/.local/bin</kbd> | <kbd>~/.local/bin</kbd> | <kbd>$home/bin</kbd> |
8484

8585
</details>
8686

‎paths_darwin.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@ func initBaseDirs(home string) {
1818

1919
// Initialize standard directories.
2020
baseDirs.dataHome = pathutil.EnvPath(envDataHome, homeAppSupport)
21-
baseDirs.data = pathutil.EnvPathList(envDataDirs, rootAppSupport)
21+
baseDirs.data = pathutil.EnvPathList(envDataDirs,
22+
rootAppSupport,
23+
filepath.Join(home, ".local", "share"),
24+
)
2225
baseDirs.configHome = pathutil.EnvPath(envConfigHome, homeAppSupport)
2326
baseDirs.config = pathutil.EnvPathList(envConfigDirs,
2427
filepath.Join(home, "Library", "Preferences"),
2528
rootAppSupport,
2629
"/Library/Preferences",
30+
filepath.Join(home, ".config"),
2731
)
2832
baseDirs.stateHome = pathutil.EnvPath(envStateHome, homeAppSupport)
2933
baseDirs.cacheHome = pathutil.EnvPath(envCacheHome, filepath.Join(home, "Library", "Caches"))

‎paths_darwin_test.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ func TestDefaultBaseDirs(t *testing.T) {
2323
actual: &xdg.DataHome,
2424
},
2525
&envSample{
26-
name: "XDG_DATA_DIRS",
27-
expected: []string{rootAppSupport},
28-
actual: &xdg.DataDirs,
26+
name: "XDG_DATA_DIRS",
27+
expected: []string{
28+
rootAppSupport,
29+
filepath.Join(home, ".local", "share"),
30+
},
31+
actual: &xdg.DataDirs,
2932
},
3033
&envSample{
3134
name: "XDG_CONFIG_HOME",
@@ -38,6 +41,7 @@ func TestDefaultBaseDirs(t *testing.T) {
3841
filepath.Join(home, "Library", "Preferences"),
3942
rootAppSupport,
4043
"/Library/Preferences",
44+
filepath.Join(home, ".config"),
4145
},
4246
actual: &xdg.ConfigDirs,
4347
},

0 commit comments

Comments
 (0)