awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-01 12:17:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

cli/env: fix whitelist not shadowing blacklist

Browse Source 
If an ENVVAR was in the blacklist, it was omitted even if it matched a
whitelist rule.
This commit is contained in:
Henrik Lissner
2021-04-25 18:36:54 -04:00
parent 9d643b14ed
commit 44a501911b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/cli/env.el
View File

@ -124,12 +124,14 @@ default, on Linux, this is '$SHELL -ic /usr/bin/env'. Variables in
(whitelist (remq nil (append whitelist doom-env-whitelist)))) (whitelist (remq nil (append whitelist doom-env-whitelist))))
(insert "(") (insert "(")
(dolist (env doom--initial-process-environment) (dolist (env doom--initial-process-environment)
(let* ((var (car (split-string env "="))) (catch 'skip
(pred (doom-rpartial #'string-match-p var))) (let* ((var (car (split-string env "=")))
(if (seq-find pred blacklist) (pred (doom-rpartial #'string-match-p var)))
(doom-log "Ignoring %s" var) (when (seq-find pred blacklist)
(when (seq-find pred whitelist) (if (seq-find pred whitelist)
(doom-log "Whitelisted %s" var)) (doom-log "Whitelisted %s" var)
(doom-log "Ignored %s" var)
(throw 'skip t)))
(insert (prin1-to-string env) "\n ")))) (insert (prin1-to-string env) "\n "))))
(insert ")")) (insert ")"))
(print! (success "Successfully generated %S") (path env-file)) (print! (success "Successfully generated %S") (path env-file))