Fix XDG_ env var handling

This commit is contained in:
Robert Hensing 2019-11-22 23:19:16 +01:00
parent a422a9797a
commit bf4d43602f

View file

@ -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