diff options
| author | Christopher Baines <mail@cbaines.net> | 2021-02-03 09:14:43 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2021-02-03 09:57:35 +0000 |
| commit | e740cc614096e768813280c718f9e96343ba41b3 (patch) | |
| tree | 25ade70a5d408be80f62f19c6511172aab7dcce5 /guix/ui.scm | |
| parent | 1b9186828867e77af1f2ee6741063424f8256398 (diff) | |
| parent | 63cf277bfacf282d2b19f00553745b2a9370eca0 (diff) | |
| download | guix-patches-e740cc614096e768813280c718f9e96343ba41b3.tar guix-patches-e740cc614096e768813280c718f9e96343ba41b3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/ui.scm')
| -rw-r--r-- | guix/ui.scm | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index bd504c68da..45ae14f83c 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -2124,24 +2124,20 @@ Run COMMAND with ARGS.\n")) "Run COMMAND with the given ARGS. Report an error when COMMAND is not found." (define module - (catch 'misc-error - (lambda () - (resolve-interface `(guix scripts ,command))) - (lambda _ - ;; Check if there is a matching extension. - (catch 'misc-error - (lambda () - (match (search-path (extension-directories) - (format #f "~a.scm" command)) - (#f - (throw 'misc-error)) - (file - (load file) - (resolve-interface `(guix extensions ,command))))) - (lambda _ - (format (current-error-port) - (G_ "guix: ~a: command not found~%") command) - (show-guix-usage)))))) + ;; Check if there is a matching extension. + (match (search-path (extension-directories) + (format #f "~a.scm" command)) + (#f + (catch 'misc-error + (lambda () + (resolve-interface `(guix scripts ,command))) + (lambda _ + (format (current-error-port) + (G_ "guix: ~a: command not found~%") command) + (show-guix-usage)))) + (file + (load file) + (resolve-interface `(guix extensions ,command))))) (let ((command-main (module-ref module (symbol-append 'guix- command)))) |