[PATCH] scripts: container: Pass through TERM when calling exec

[PATCH] scripts: container: Pass through TERM when calling exec

[Christopher Baines]

* guix/scripts/container/exec.scm (guix-container-exec): Capture the value of
  the TERM environment variable, and pass it through to the container.  This
  means some applications now work where they did not before (e.g. htop), and
  others have more functionality, providing that the terminal was capable of
  enabling that functionality in the first place.
---
 guix/scripts/container/exec.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/container/exec.scm b/guix/scripts/container/exec.scm
index 10e70568c..2dd6d802d 100644
--- a/guix/scripts/container/exec.scm
+++ b/guix/scripts/container/exec.scm
@@ -74,7 +74,17 @@ and the other containing arguments for the command to be executed."
       (let* ((opts (parse-command-line args %options '(())
                                        #:argument-handler
                                        handle-argument))
-             (pid  (assoc-ref opts 'pid)))
+             (pid  (assoc-ref opts 'pid))
+             (environment (fold (lambda (name alist)
+                                  (let ((value (getenv name)))
+                                    (if value
+                                        (cons (cons name value) alist)
+                                        alist)))
+                                '()
+                                ;; Pass through the TERM environment variable
+                                ;; to inform processes about the capabilities
+                                ;; of the terminal
+                                '("TERM"))))
 
         (unless pid
           (leave (_ "no pid specified~%")))
@@ -89,6 +99,9 @@ and the other containing arguments for the command to be executed."
                         (lambda ()
                           (match command
                             ((program . program-args)
+                             (for-each
+                              (match-lambda ((name . value) (setenv name value)))
+                              environment)
                              (apply execlp program program program-args)))))))
           (unless (zero? result)
             (leave (_ "exec failed with status ~d~%") result)))))))
-- 
2.11.0

Re: [PATCH] scripts: container: Pass through TERM when calling exec

[Ludovic Courtès]

Christopher Baines <mail@cbaines.net> skribis:

> * guix/scripts/container/exec.scm (guix-container-exec): Capture the value of
>   the TERM environment variable, and pass it through to the container.  This
>   means some applications now work where they did not before (e.g. htop), and
>   others have more functionality, providing that the terminal was capable of
>   enabling that functionality in the first place.

Good idea.  Applied, thanks!

Ludo’.

Re: [PATCH] scripts: container: Pass through TERM when calling exec

[Ludovic Courtès]

Christopher Baines <mail@cbaines.net> skribis:

> +             (environment (fold (lambda (name alist)
> +                                  (let ((value (getenv name)))
> +                                    (if value
> +                                        (cons (cons name value) alist)
> +                                        alist)))
> +                                '()
> +                                ;; Pass through the TERM environment variable
> +                                ;; to inform processes about the capabilities
> +                                ;; of the terminal
> +                                '("TERM"))))

I changed that to ‘filter-map’, which is slightly more concise.

Ludo’.

Re: [PATCH] scripts: container: Pass through TERM when calling exec

[Thompson, David]

Hey Christopher,

On Wed, Jan 25, 2017 at 2:24 AM, Christopher Baines <mail@cbaines.net> wrote:
> * guix/scripts/container/exec.scm (guix-container-exec): Capture the value of
>   the TERM environment variable, and pass it through to the container.  This
>   means some applications now work where they did not before (e.g. htop), and
>   others have more functionality, providing that the terminal was capable of
>   enabling that functionality in the first place.

Good idea! Thanks for doing this!

- Dave