@@ -2123,6 +2123,14 @@ Run COMMAND with ARGS.\n"))
(define (run-guix-command command . args)
"Run COMMAND with the given ARGS. Report an error when COMMAND is not
found."
+ (define (command-hint guess commands)
+ (define command-names
+ (map (lambda (command)
+ (match (command-name command)
+ ((head tail ...) head)))
+ commands))
+ (string-closest (symbol->string guess) command-names #:threshold 3))
+
(define module
(catch 'misc-error
(lambda ()
@@ -2139,9 +2147,12 @@ found."
(load file)
(resolve-interface `(guix extensions ,command)))))
(lambda _
- (format (current-error-port)
- (G_ "guix: ~a: command not found~%") command)
- (show-guix-usage))))))
+ (let ((hint (command-hint command (commands))))
+ (when hint
+ (display-hint (format #f (G_ "Do you mean @code{~a}?") hint)))
+ (format (current-error-port)
+ (G_ "guix: ~a: command not found~%") command)
+ (show-guix-usage)))))))
(let ((command-main (module-ref module
(symbol-append 'guix- command))))