diff options
Diffstat (limited to 'guix/scripts/environment.scm')
| -rw-r--r-- | guix/scripts/environment.scm | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 0d5cab432c..fc75d78611 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -358,8 +358,22 @@ and suitable for 'exit'." "Run COMMAND in a new environment containing INPUTS, using the native search paths defined by the list PATHS. When PURE?, pre-existing environment variables are cleared before setting the new ones." + ;; Properly handle SIGINT, so pressing C-c in an interactive terminal + ;; application works. + (sigaction SIGINT SIG_DFL) (create-environment inputs paths pure?) - (apply system* command)) + (match command + ((program . args) + (apply execlp program program args)))) + +(define (launch-environment/fork command inputs paths pure?) + "Run COMMAND in a new process with an environment containing INPUTS, using +the native search paths defined by the list PATHS. When PURE?, pre-existing +environment variables are cleared before setting the new ones." + (match (primitive-fork) + (0 (launch-environment command inputs paths pure?)) + (pid (match (waitpid pid) + ((_ . status) status))))) (define* (launch-environment/container #:key command bash user-mappings profile paths network?) @@ -582,4 +596,5 @@ message if any test fails." (else (return (exit/status - (launch-environment command profile paths pure?))))))))))))) + (launch-environment/fork command profile + paths pure?))))))))))))) |