summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-06-01 16:08:20 +0200
committerLudovic Courtès <ludo@gnu.org>2022-06-04 12:04:24 +0200
commitf9fb00ff082a54ee113320329a7bd089d4d0b314 (patch)
tree478069a16bcabf688e278075f2728035101edeca
parent104b4e25ab7da5697f2f6f1ddfdd4955f05afece (diff)
edit: Extract 'spawn-editor' procedure.
* guix/scripts/edit.scm (spawn-editor): New procedure, with code from... (guix-edit): ... here. Use it.
-rw-r--r--guix/scripts/edit.scm30
1 files changed, 18 insertions, 12 deletions
diff --git a/guix/scripts/edit.scm b/guix/scripts/edit.scm
index a2e1ffb434..8e777d1405 100644
--- a/guix/scripts/edit.scm
+++ b/guix/scripts/edit.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015-2016, 2019-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2020, 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;;
@@ -27,6 +27,7 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-37)
#:export (%editor
+ spawn-editor
guix-edit))
(define %options
@@ -77,6 +78,21 @@ line."
(location-line location)))
(search-path* %load-path (location-file location))))
+(define (spawn-editor locations)
+ "Spawn (%editor) to edit the code at LOCATIONS, a list of <location>
+records, and exit."
+ (catch 'system-error
+ (lambda ()
+ (let ((file-names (append-map location->location-specification
+ locations)))
+ ;; Use `system' instead of `exec' in order to sanely handle
+ ;; possible command line arguments in %EDITOR.
+ (exit (system (string-join (cons (%editor) file-names))))))
+ (lambda args
+ (let ((errno (system-error-errno args)))
+ (leave (G_ "failed to launch '~a': ~a~%")
+ (%editor) (strerror errno))))))
+
(define-command (guix-edit . args)
(category packaging)
@@ -94,14 +110,4 @@ line."
(when (null? specs)
(leave (G_ "no packages specified, nothing to edit~%")))
- (catch 'system-error
- (lambda ()
- (let ((file-names (append-map location->location-specification
- locations)))
- ;; Use `system' instead of `exec' in order to sanely handle
- ;; possible command line arguments in %EDITOR.
- (exit (system (string-join (cons (%editor) file-names))))))
- (lambda args
- (let ((errno (system-error-errno args)))
- (leave (G_ "failed to launch '~a': ~a~%")
- (%editor) (strerror errno))))))))
+ (spawn-editor locations))))