Revert "ui: Fix not finding compiled files when loading extensions"

This reverts commit bf1f18130f2b54a2bd1e8a57d6dae3a611573ee8, which broke
extension loading entirely due to the mismatch between the module name and the
file tree layout, as discussed at
<https://codeberg.org/guix/guix/pulls/10705#issuecomment-21630365>.

1 files changed, 20 insertions, 14 deletions

diff --git a/guix/ui.scm b/guix/ui.scm
index 78a58e353e1..dafc04b20f7 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -2447,17 +2447,26 @@ found."
 
   (define module
     ;; Check if there is a matching extension.
-    (catch 'misc-error
-      (lambda ()
-        (or (false-if-exception (resolve-interface `(guix scripts ,command)))
-            (resolve-interface `(guix extensions ,command))))
-      (lambda _
-        (let ((hint (command-hint command (commands))))
-          (format (current-error-port)
-                  (G_ "guix: ~a: command not found~%") command)
-          (when hint
-            (display-hint (G_ "Did you mean @code{~a}?") hint))
-          (show-guix-usage)))))
+    (match (search-path (extension-directories)
+                        (format #f "~a.scm" command))
+      (#f
+       (catch 'misc-error
+         (lambda ()
+           (resolve-interface `(guix scripts ,command)))
+         (lambda _
+           (let ((hint (command-hint command (commands))))
+             (format (current-error-port)
+                     (G_ "guix: ~a: command not found~%") command)
+             (when hint
+               (display-hint (G_ "Did you mean @code{~a}?") hint))
+             (show-guix-usage)))))
+      (file
+       (load file)
+       (let ((maybe-extension-path
+              (format #f "/guix/extensions/~a.scm" command)))
+         (if (string-suffix? maybe-extension-path file)
+             (resolve-interface `(guix extensions ,command))
+             (resolve-interface `(guix scripts ,command)))))))
 
   (let ((command-main (module-ref module
                                   (symbol-append 'guix- command))))
@@ -2481,9 +2490,6 @@ and signal handling have already been set up."
   ;; number of 'stat' calls per entry in %LOAD-PATH.  Shamelessly remove it.
   (set! %load-extensions '(".scm"))
 
-  ;; Extensions take precedence over core commands.
-  (set! %load-path (append (extension-directories) %load-path))
-
   ;; Disable canonicalization so we don't don't stat unreasonably.
   (with-fluids ((%file-port-name-canonicalization #f))
     (match args