branch: externals/system-packages
commit e882ac15ce54bb9b32c093cf039f0e19e4ac1d5c
Author: David Florness <[email protected]>
Commit: David Florness <[email protected]>
`system-packages-packagemanager' to `system-packages-package-manager'
---
README.org | 6 +++---
system-packages.el | 22 +++++++++++-----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/README.org b/README.org
index e708eeb..7721d2e 100644
--- a/README.org
+++ b/README.org
@@ -20,7 +20,7 @@ packages more convenient through emacs.
The package attempts to guess which package manager you use. If it
guesses wrong (or you'd like to set it manually), you may modify the
- variable =system-packages-packagemanager=.
+ variable =system-packages-package-manager=.
We also attempt to guess whether or not to use sudo with appropriate
commands (like installing and uninstalling packages). Some package
@@ -80,10 +80,10 @@ the commands to
=system-packages-supported-package-managers= like so:
(noconfirm . "--noconfirm"))))
#+END_SRC
-You may then need to adjust =system-packages-packagemanager= and
+You may then need to adjust =system-packages-package-manager= and
=system-packages-usesudo= accordingly:
#+BEGIN_SRC emacs-lisp
(setq system-packages-usesudo t)
- (setq system-packages-packagemanager "pacaur")
+ (setq system-packages-package-manager "pacaur")
#+END_SRC
diff --git a/system-packages.el b/system-packages.el
index 4cc2ec6..4e3feb6 100644
--- a/system-packages.el
+++ b/system-packages.el
@@ -256,7 +256,7 @@ default."
'system-packages-package-manager "2017-12-25")
(defcustom system-packages-use-sudo
- (cdr (assoc 'default-sudo (cdr (assoc system-packages-packagemanager
+ (cdr (assoc 'default-sudo (cdr (assoc system-packages-package-manager
system-packages-supported-package-managers))))
"If non-nil, system-packages uses sudo for appropriate commands.
@@ -282,14 +282,14 @@ used to operation on specific packages.
ARGS gets passed to the command and is useful for passing options
to the package manager."
(let ((command
- (cdr (assoc action (cdr (assoc system-packages-packagemanager
+ (cdr (assoc action (cdr (assoc system-packages-package-manager
system-packages-supported-package-managers)))))
(noconfirm (when system-packages-noconfirm
(cdr (assoc 'noconfirm
- (cdr (assoc system-packages-packagemanager
+ (cdr (assoc system-packages-package-manager
system-packages-supported-package-managers)))))))
(unless command
- (error (format "%S not supported in %S" action
system-packages-packagemanager)))
+ (error (format "%S not supported in %S" action
system-packages-package-manager)))
(unless (listp command)
(setq command (list command)))
(when system-packages-usesudo
@@ -309,7 +309,7 @@ to the package manager."
(defun system-packages-install (pack &optional args)
"Install system packages.
-Use the package manager from `system-packages-packagemanager' to
+Use the package manager from `system-packages-package-manager' to
install PACK. You may use ARGS to pass options to the package
manger."
(interactive "sPackage to install: ")
@@ -319,7 +319,7 @@ manger."
(defun system-packages-search (pack &optional args)
"Search for system packages.
-Use the package manager named in `system-packages-packagemanager'
+Use the package manager named in `system-packages-package-manager'
to search for PACK. You may use ARGS to pass options to the
package manager."
(interactive "sSearch string: ")
@@ -330,7 +330,7 @@ package manager."
"Uninstall system packages.
Uses the package manager named in
-`system-packages-packagemanager' to uninstall PACK. You may use
+`system-packages-package-manager' to uninstall PACK. You may use
ARGS to pass options to the package manager."
(interactive "sWhat package to uninstall: ")
(system-packages--run-command 'uninstall pack args))
@@ -370,7 +370,7 @@ You may use ARGS to pass options to the package manager."
(defun system-packages-update (&optional args)
"Update system packages.
-Use the package manager `system-packages-packagemanager'. You
+Use the package manager `system-packages-package-manager'. You
may use ARGS to pass options to the package manger."
(interactive)
(system-packages--run-command 'update nil args))
@@ -380,7 +380,7 @@ may use ARGS to pass options to the package manger."
"Remove orphaned packages.
Uses the package manager named in
-`system-packages-packagemanager'. You may use ARGS to pass
+`system-packages-package-manager'. You may use ARGS to pass
options to the package manger."
(interactive)
(system-packages--run-command 'remove-orphaned nil args))
@@ -390,7 +390,7 @@ options to the package manger."
"List explicitly installed packages.
Uses the package manager named in
-`system-packages-packagemanager'. With
+`system-packages-package-manager'. With
\\[universal-argument] (for ALL), list all installed packages.
You may use ARGS to pass options to the package manger."
(interactive "P")
@@ -408,7 +408,7 @@ You may use ARGS to pass options to the package manger."
;;;###autoload
(defun system-packages-log (&optional args)
- "Show a log from `system-packages-packagemanager'.
+ "Show a log from `system-packages-package-manager'.
You may use ARGS to pass options to the package manger."
(interactive)
