emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add -A/-R switches to 'doom env'

Browse source 
Two new convenience switches for generating envvar files:

  doom env -A x
  doom env -R x

Is equivalent to

  doom env -a x -r .
  doom env -r x -a .
This commit is contained in:
Henrik Lissner 2020-08-01 15:23:10 -04:00
parent 68507e1eac
commit 7dab38deea
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/cli/env.el
View file

@ -1,10 +1,12 @@
;;; core/cli/env.el -*- lexical-binding: t; -*- ;;; core/cli/env.el -*- lexical-binding: t; -*-
(defcli! env (defcli! env
((allow ["-a" "--allow" regexp] "An envvar whitelist regexp") ((allow ["-a" "--allow" regexp] "An additive envvar whitelist regexp")
(reject ["-r" "--reject" regexp] "An envvar blacklist regexp") (reject ["-r" "--reject" regexp] "An additive envvar blacklist regexp")
(clear-p ["-c" "--clear"] "Clear and delete your envvar file") (allow-only ["-A" regexp] "Blacklist everything but REGEXP")
(outputfile ["-o" path] (reject-only ["-R" regexp] "Whitelist everything but REGEXP")
(clear-p ["-c" "--clear"] "Clear and delete your envvar file")
(outputfile ["-o" path]
"Generate the envvar file at PATH. Envvar files that aren't in "Generate the envvar file at PATH. Envvar files that aren't in
`doom-env-file' won't be loaded automatically at startup. You will need to load `doom-env-file' won't be loaded automatically at startup. You will need to load
them manually from your private config with the `doom-load-envvars-file' them manually from your private config with the `doom-load-envvars-file'
@ -42,7 +44,11 @@ Why this over exec-path-from-shell?
(let ((env-file (expand-file-name (or outputfile doom-env-file)))) (let ((env-file (expand-file-name (or outputfile doom-env-file))))
(if (null clear-p) (if (null clear-p)
(doom-cli-reload-env-file (doom-cli-reload-env-file
'force env-file (list allow) (list reject)) 'force env-file
(append (if reject-only (list "."))
(delq nil (list allow allow-only)))
(append (if allow-only (list "."))
(delq nil (list reject reject-only))))
(unless (file-exists-p env-file) (unless (file-exists-p env-file)
(user-error! "%S does not exist to be cleared" (user-error! "%S does not exist to be cleared"
(path env-file))) (path env-file)))