diff options
| author | John Wiegley <johnw@newartisans.com> | 2018-01-27 00:46:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-27 00:46:16 -0800 |
| commit | fd8a3510fd1a555b925f57b2870917e3c4ea0206 (patch) | |
| tree | 76d8bec314f1c6257fe03ef386a7800171c24862 /lisp/use-package | |
| parent | 567df21f26c0cc6ceb2ba06968405428ef299896 (diff) | |
| parent | b7252f8e63a14bbc83d9db6431f5c5161300f212 (diff) | |
| download | emacs-fd8a3510fd1a555b925f57b2870917e3c4ea0206.tar.gz emacs-fd8a3510fd1a555b925f57b2870917e3c4ea0206.tar.bz2 emacs-fd8a3510fd1a555b925f57b2870917e3c4ea0206.zip | |
Merge pull request from jabranham/system-packages-update
System packages update
GitHub-reference: https://github.com/jwiegley/use-package/issues/616
Diffstat (limited to 'lisp/use-package')
| -rw-r--r-- | lisp/use-package/use-package-ensure-system-package.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/use-package/use-package-ensure-system-package.el b/lisp/use-package/use-package-ensure-system-package.el index 0fae57aff76..48fbde2e20a 100644 --- a/lisp/use-package/use-package-ensure-system-package.el +++ b/lisp/use-package/use-package-ensure-system-package.el @@ -1,4 +1,4 @@ -;;; use-package-ensure-system-package.el --- auto install system packages +;;; use-package-ensure-system-package.el --- auto install system packages -*- lexical: t; -*- ;; Copyright (C) 2017 Justin Talbott @@ -23,20 +23,20 @@ (require 'system-packages nil t) (eval-when-compile - (defvar system-packages-packagemanager) + (defvar system-packages-package-manager) (defvar system-packages-supported-package-managers) - (defvar system-packages-usesudo)) + (defvar system-packages-use-sudo)) (defun use-package-ensure-system-package-install-command (pack) - "Return the default install command for `pack'." + "Return the default install command for PACK." (let ((command - (cdr (assoc 'install (cdr (assoc system-packages-packagemanager + (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-packagemanager))) + (error (format "%S not supported in %S" 'install system-packages-package-manager))) (unless (listp command) (setq command (list command))) - (when system-packages-usesudo + (when system-packages-use-sudo (setq command (mapcar (lambda (part) (concat "sudo " part)) command))) (setq command (mapconcat 'identity command " && ")) (mapconcat 'identity (list command pack) " "))) |