summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-03-04 22:31:59 +0100
committerMarius Bakke <mbakke@fastmail.com>2019-03-04 22:31:59 +0100
commit4f8dc1536adf5965597d53a1e7867690429a12b2 (patch)
tree1d6456941b23316020c9f0edac8e22187134488d /guix
parent19464173bafdc42adfc8dd7277c491c40ddef66b (diff)
parent5ae458befc803fe357210fef343cf322d9f4bade (diff)
Merge branch 'master' into staging
Diffstat (limited to 'guix')
-rw-r--r--guix/scripts/environment.scm12
1 files changed, 8 insertions, 4 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 3966531efa..63f6129279 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -141,7 +141,7 @@ COMMAND or an interactive shell in that environment.\n"))
(display (G_ "
--pure unset existing environment variables"))
(display (G_ "
- --inherit=REGEXP inherit environment variables that match REGEXP"))
+ -E, --preserve=REGEXP preserve environment variables that match REGEXP"))
(display (G_ "
--search-paths display needed environment variable definitions"))
(display (G_ "
@@ -215,14 +215,18 @@ COMMAND or an interactive shell in that environment.\n"))
(option '("pure") #f #f
(lambda (opt name arg result)
(alist-cons 'pure #t result)))
- (option '("inherit") #t #f
+ (option '(#\E "preserve") #t #f
(lambda (opt name arg result)
(alist-cons 'inherit-regexp
(make-regexp* arg)
result)))
- (option '(#\E "exec") #t #f ; deprecated
+ (option '("inherit") #t #f ;deprecated
(lambda (opt name arg result)
- (alist-cons 'exec (list %default-shell "-c" arg) result)))
+ (warning (G_ "'--inherit' is deprecated, \
+use '--preserve' instead~%"))
+ (alist-cons 'inherit-regexp
+ (make-regexp* arg)
+ result)))
(option '("search-paths") #f #f
(lambda (opt name arg result)
(alist-cons 'search-paths #t result)))