revert and refactor

This commit is contained in:
2026-05-23 15:40:18 +00:00
parent 7bfca66aa5
commit 94104e4a79
+14 -14
View File
@@ -46,14 +46,14 @@
(defgroup incus-tramp nil (defgroup incus-tramp nil
"TRAMP integration for Incus." "TRAMP integration for Incus."
:group 'tramp) :group 'tramp
:prefix "incus-tramp-")
(defcustom incus-tramp-incus-program "incus" (defcustom incus-tramp-program "incus"
"Path to the Incus executable." "The executable name for Incus CLI"
:type 'string :type 'string
:group 'incus-tramp) :group 'incus-tramp)
;;;###autoload
(defconst incus-tramp-method "incus" (defconst incus-tramp-method "incus"
"Tramp method name to connect to Incus containers.") "Tramp method name to connect to Incus containers.")
@@ -67,17 +67,17 @@
(defun incus-tramp-enable-method () (defun incus-tramp-enable-method ()
(with-eval-after-load 'tramp (with-eval-after-load 'tramp
(add-to-list 'tramp-methods (add-to-list 'tramp-methods
(incus-tramp-method `(,incus-tramp-method
(tramp-login-program incus-tramp-incus-program) (tramp-login-program ,incus-tramp-program)
(tramp-login-args (("exec") ("%h") ((format "--env TERM=%s" tramp-terminal-type)) ("--") ("%l"))) (tramp-login-args (("exec") ("%h") (,(format "--env TERM=%s" tramp-terminal-type)) ("--") ("%l")))
(tramp-direct-async (tramp-default-remote-shell "-c")) (tramp-direct-async "/bin/sh")
(tramp-remote-shell tramp-default-remote-shell) (tramp-remote-shell "/bin/sh")
(tramp-remote-shell-login ("-l")) (tramp-remote-shell-login ("-l"))
(tramp-remote-shell-args ("-i" "-c")) (tramp-remote-shell-args ("-i" "-c"))
(tramp-completion-use-cache nil) (tramp-completion-use-cache nil)
(tramp-connection-timeout 60))) (tramp-connection-timeout 60)))
(tramp-set-completion-function incus-tramp-method (tramp-set-completion-function incus-tramp-method
((tramp-incus-completion-function incus-tramp-method))) `((tramp-incus-completion-function ,incus-tramp-method)))
(add-to-list 'tramp-completion-multi-hop-methods incus-tramp-method))) (add-to-list 'tramp-completion-multi-hop-methods incus-tramp-method)))
(provide 'incus-tramp) (provide 'incus-tramp)