From 6403f4f883fadb147a8c42d9123763913a90a850 Mon Sep 17 00:00:00 2001 From: Brian Cully Date: Sat, 19 Feb 2022 16:20:00 -0500 Subject: Rename tramp-nspawn-machinectl-file-name to -program. Seems to be more in line with what other packages are doing. --- tramp-nspawn.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tramp-nspawn.el b/tramp-nspawn.el index 0219643..286074a 100644 --- a/tramp-nspawn.el +++ b/tramp-nspawn.el @@ -68,8 +68,8 @@ :link '(url-link :tag "Github" "https://github.com/bjc/tramp-nspawn") :link '(emacs-commentary-link :tag "Commentary" "tramp-nspawn")) -(defcustom tramp-nspawn-machinectl-file-name "machinectl" - "File name of machinectl executable." +(defcustom tramp-nspawn-machinectl-program "machinectl" + "Name of the machinectl program." :type 'string :group 'tramp-nspawn) @@ -82,7 +82,7 @@ This function is used by ‘tramp-set-completion-function’, please see its function help for a description of the format." (let* ((raw-list (shell-command-to-string - (concat tramp-nspawn-machinectl-file-name + (concat tramp-nspawn-machinectl-program " list -q"))) (lines (cdr (split-string raw-list "\n"))) (first-words (mapcar (lambda (line) (car (split-string line))) @@ -94,7 +94,7 @@ see its function help for a description of the format." (defun tramp-nspawn--add-method () "Add Tramp method handler for nspawn containers." (push `(,tramp-nspawn-method - (tramp-login-program ,tramp-nspawn-machinectl-file-name) + (tramp-login-program ,tramp-nspawn-machinectl-program) (tramp-login-args (("shell") ("-q") ("--uid" "%u") -- cgit v1.2.3