[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/21: home-services: activation: Add support for multiline env vars.
From: |
guix-commits |
Subject: |
13/21: home-services: activation: Add support for multiline env vars. |
Date: |
Thu, 9 Sep 2021 13:33:37 -0400 (EDT) |
wigust pushed a commit to branch wip-guix-home
in repository guix.
commit a307b51ea8353289bf338b3409d06b50c89f3d84
Author: Andrew Tropin <andrew@trop.in>
AuthorDate: Mon Aug 30 12:26:19 2021 +0300
home-services: activation: Add support for multiline env vars.
Signed-off-by: Oleg Pykhalov <go.wigust@gmail.com>
---
gnu/home-services.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/home-services.scm b/gnu/home-services.scm
index 16b9736..2a77349 100644
--- a/gnu/home-services.scm
+++ b/gnu/home-services.scm
@@ -324,7 +324,7 @@ extended with one gexp.")))
#f))))
(if (file-exists? (he-init-file new-home))
(let* ((port ((@ (ice-9 popen) open-input-pipe)
- (format #f "source ~a && env"
+ (format #f "source ~a && env -0"
(he-init-file new-home))))
(result ((@ (ice-9 rdelim) read-delimited) "" port))
(vars (map (lambda (x)
@@ -333,7 +333,7 @@ extended with one gexp.")))
(string-drop x (1+ si)))))
((@ (srfi srfi-1) remove)
string-null?
- (string-split result #\newline)))))
+ (string-split result #\nul)))))
(close-port port)
(map (lambda (x) (setenv (car x) (cdr x))) vars)
- 01/21: home-services: Add most essential home services., (continued)
- 01/21: home-services: Add most essential home services., guix-commits, 2021/09/09
- 02/21: home-services: Add home-run-on-change-service-type., guix-commits, 2021/09/09
- 06/21: home-services: Add fontutils., guix-commits, 2021/09/09
- 04/21: home-services: Add fold-home-service-types function., guix-commits, 2021/09/09
- 14/21: gnu: home: Add doc comment about the module., guix-commits, 2021/09/09
- 17/21: scripts: home: Add import subcommand., guix-commits, 2021/09/09
- 07/21: home-services: Add helper functions for service configurations., guix-commits, 2021/09/09
- 16/21: scripts: Add 'guix home'., guix-commits, 2021/09/09
- 08/21: home-services: Add shells., guix-commits, 2021/09/09
- 19/21: home-services: run-on-change: Handle first generation case., guix-commits, 2021/09/09
- 13/21: home-services: activation: Add support for multiline env vars.,
guix-commits <=
- 05/21: home-services: Add symlink-manager., guix-commits, 2021/09/09
- 09/21: home-services: Add xdg., guix-commits, 2021/09/09
- 11/21: home-services: Add utils module., guix-commits, 2021/09/09
- 12/21: home-services: symlink-manager: Properly handle 1st generation case., guix-commits, 2021/09/09
- 18/21: home-services: configuration: Add generic-serialize-alist., guix-commits, 2021/09/09
- 10/21: home: Add home-environment., guix-commits, 2021/09/09
- 15/21: gnu: local.mk: Tabify., guix-commits, 2021/09/09
- 03/21: home-services: Add home-provenance-service-type., guix-commits, 2021/09/09
- 20/21: doc: Add Guix Home documentation., guix-commits, 2021/09/09
- 21/21: home-services: Add Shepherd., guix-commits, 2021/09/09