[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/07: edit: Extract 'spawn-editor' procedure.
From: |
guix-commits |
Subject: |
03/07: edit: Extract 'spawn-editor' procedure. |
Date: |
Sat, 4 Jun 2022 06:09:55 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit f9fb00ff082a54ee113320329a7bd089d4d0b314
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Jun 1 16:08:20 2022 +0200
edit: Extract 'spawn-editor' procedure.
* guix/scripts/edit.scm (spawn-editor): New procedure, with code from...
(guix-edit): ... here. Use it.
---
guix/scripts/edit.scm | 30 ++++++++++++++++++------------
1 file 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))))
- branch master updated (8334e7c36b -> ac826aef9c), guix-commits, 2022/06/04
- 01/07: doc: Capitalize and tweak cross-compilation-related node names., guix-commits, 2022/06/04
- 03/07: edit: Extract 'spawn-editor' procedure.,
guix-commits <=
- 07/07: news: Add entry for 'guix system edit' and 'guix home edit'., guix-commits, 2022/06/04
- 02/07: cache: Catch invalid 'last-expiry-cleanup'., guix-commits, 2022/06/04
- 05/07: home: services: Add 'lookup-home-service-types' procedure., guix-commits, 2022/06/04
- 06/07: guix home: Add 'edit' sub-command., guix-commits, 2022/06/04
- 04/07: guix system: Add 'edit' sub-command., guix-commits, 2022/06/04