mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-06 04:09:37 +00:00
Merge pull request from jabranham/system-packages-update
System packages update GitHub-reference: https://github.com/jwiegley/use-package/issues/616
This commit is contained in:
commit
fd8a3510fd
1 changed files with 7 additions and 7 deletions
|
@ -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
|
;; Copyright (C) 2017 Justin Talbott
|
||||||
|
|
||||||
|
@ -23,20 +23,20 @@
|
||||||
(require 'system-packages nil t)
|
(require 'system-packages nil t)
|
||||||
|
|
||||||
(eval-when-compile
|
(eval-when-compile
|
||||||
(defvar system-packages-packagemanager)
|
(defvar system-packages-package-manager)
|
||||||
(defvar system-packages-supported-package-managers)
|
(defvar system-packages-supported-package-managers)
|
||||||
(defvar system-packages-usesudo))
|
(defvar system-packages-use-sudo))
|
||||||
|
|
||||||
(defun use-package-ensure-system-package-install-command (pack)
|
(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
|
(let ((command
|
||||||
(cdr (assoc 'install (cdr (assoc system-packages-packagemanager
|
(cdr (assoc 'install (cdr (assoc system-packages-package-manager
|
||||||
system-packages-supported-package-managers))))))
|
system-packages-supported-package-managers))))))
|
||||||
(unless command
|
(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)
|
(unless (listp command)
|
||||||
(setq command (list 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 (mapcar (lambda (part) (concat "sudo " part)) command)))
|
||||||
(setq command (mapconcat 'identity command " && "))
|
(setq command (mapconcat 'identity command " && "))
|
||||||
(mapconcat 'identity (list command pack) " ")))
|
(mapconcat 'identity (list command pack) " ")))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue