Fix XDG_ env var handling
This commit is contained in:
parent
a422a9797a
commit
bf4d43602f
1 changed files with 4 additions and 4 deletions
|
|
@ -203,9 +203,9 @@ rec {
|
|||
|
||||
maybeXdgGitConfigFile =
|
||||
for
|
||||
(guardNonEmptyString (/. + builtins.getEnv "XDG_CONFIG_HOME"))
|
||||
(guardNonEmptyString (builtins.getEnv "XDG_CONFIG_HOME"))
|
||||
(xdgConfigHome:
|
||||
guardFile (xdgConfigHome + "/git/config")
|
||||
guardFile (/. + xdgConfigHome + "/git/config")
|
||||
);
|
||||
maybeGlobalConfig = take 1 (guardFile ~/.gitconfig
|
||||
++ maybeXdgGitConfigFile
|
||||
|
|
@ -226,9 +226,9 @@ rec {
|
|||
)
|
||||
);
|
||||
xdgExcludesFile = for
|
||||
(guardNonEmptyString (/. + builtins.getEnv "XDG_CONFIG_HOME"))
|
||||
(guardNonEmptyString (builtins.getEnv "XDG_CONFIG_HOME"))
|
||||
(xdgConfigHome:
|
||||
guardFile (xdgConfigHome + "/git/ignore")
|
||||
guardFile (/. + xdgConfigHome + "/git/ignore")
|
||||
);
|
||||
maybeGlobalIgnoresFile = take 1
|
||||
( globalConfiguredExcludesFile
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue