From 9f034a0bcfdd8c4a6c691d159f3a333e9ca68912 Mon Sep 17 00:00:00 2001 From: Artyom Khramov Date: Thu, 26 Apr 2018 02:22:53 +0600 Subject: [PATCH] [] ensure-system-package: honor system-packages customizations ensure-system-package doesn't honor system-packages customizations (https://github.com/jwiegley/use-package/issues/661), because system-packages didn't provide an API to retrieve shell command to be executed. This change makes use of the new system-packages' `system-package-get-command` function and therefore fixes the issue. GitHub-reference: fix https://github.com/jwiegley/use-package/issues/661 Copyright-paperwork-exempt: yes --- .../use-package-ensure-system-package.el | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/lisp/use-package/use-package-ensure-system-package.el b/lisp/use-package/use-package-ensure-system-package.el index 81beaec104f..9f2a59ae5e6 100644 --- a/lisp/use-package/use-package-ensure-system-package.el +++ b/lisp/use-package/use-package-ensure-system-package.el @@ -6,7 +6,7 @@ ;; Keywords: convenience, tools, extensions ;; URL: https://github.com/waymondo/use-package-ensure-system-package ;; Version: 0.1 -;; Package-Requires: ((use-package "2.1") (system-packages "0.1")) +;; Package-Requires: ((use-package "2.1") (system-packages "1.0.4")) ;; Filename: use-package-ensure-system-package.el ;; License: GNU General Public License version 3, or (at your option) any later version ;; @@ -29,17 +29,7 @@ (defun use-package-ensure-system-package-install-command (pack) "Return the default install command for PACK." - (let ((command - (cdr (assoc 'install (cdr (assoc system-packages-package-manager - system-packages-supported-package-managers)))))) - (unless command - (error (format "%S not supported in %S" 'install system-packages-package-manager))) - (unless (listp command) - (setq command (list command))) - (when system-packages-use-sudo - (setq command (mapcar (lambda (part) (concat "sudo " part)) command))) - (setq command (mapconcat 'identity command " && ")) - (mapconcat 'identity (list command pack) " "))) + (system-packages-get-command 'install pack)) (defun use-package-ensure-system-package-consify (arg) "Turn `arg' into a cons of (`package-name' . `install-command')." -- 2.39.2