[elpa] externals/system-packages cf64fdb 07/10: Merge branch 'dont-hardcode-and' [33]

[Stefan Monnier]

branch: externals/system-packages
commit cf64fdbbb066b6ddfcbd91f778433125d8c16abc
Merge: 2862c5b f12f051
Author: Alex Branham <alex.branham@gmail.com>
Commit: Alex Branham <alex.branham@gmail.com>

    Merge branch 'dont-hardcode-and' [33]
---
 system-packages.el | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/system-packages.el b/system-packages.el
index 4b72c6e..fee47fa 100644
--- a/system-packages.el
+++ b/system-packages.el
@@ -55,7 +55,7 @@
            (install . "guix package -i")
            (search . "guix package -s")
            (uninstall . "guix package -r")
-           (update . ("guix package --upgrade"))
+           (update . "guix package --upgrade")
            (clean-cache . "guix gc")
            (log . nil)
            (get-info . nil)
@@ -74,7 +74,7 @@
           (install . "nix-env -i")
           (search . "nix search")
           (uninstall . "nix-env -e")
-          (update . ("nix-env -u" ))
+          (update . "nix-env -u")
           (clean-cache . "nix-collect-garbage")
           (log . nil)
           (get-info . nil)
@@ -93,7 +93,7 @@
            (install . "brew install")
            (search . "brew search")
            (uninstall . "brew uninstall")
-           (update . ("brew update" "brew upgrade"))
+           (update . "brew update && brew upgrade")
            (clean-cache . "brew cleanup")
            (log . nil)
            (get-info . nil)
@@ -111,7 +111,7 @@
            (install . "port install")
            (search . "port search")
            (uninstall . "port uninstall")
-           (update . ("port sync" "port upgrade outdated"))
+           (update . "port sync && port upgrade outdated")
            (clean-cache . "port clean --all")
            (log . "port log")
            (get-info . "port info")
@@ -152,7 +152,7 @@
           (install . "apt-get install")
           (search . "apt-cache search")
           (uninstall . "apt-get --purge remove")
-          (update . ("apt-get update" "apt-get upgrade"))
+          (update . "apt-get update && apt-get upgrade")
           (clean-cache . "apt-get clean")
           (log . "cat /var/log/dpkg.log")
           (change-log . "apt-get changelog")
@@ -173,7 +173,7 @@
                (install . "aptitude install")
                (search . "aptitude search")
                (uninstall . "aptitude remove")
-               (update . ("apt update" "aptitude safe-upgrade"))
+               (update . "apt update && aptitude safe-upgrade")
                (clean-cache . "aptitude clean")
                (log . "cat /var/log/dpkg.log")
                (change-log . "aptitude changelog")
@@ -238,7 +238,7 @@
           (install . "dnf install")
           (search . "dnf search")
           (uninstall . "dnf remove")
-          (update . ("dnf upgrade"))
+          (update . "dnf upgrade")
           (clean-cache . "dnf clean all")
           (change-log . "rpm -q --changelog")
           (log . "dnf history")
@@ -284,7 +284,7 @@
                    (install . "xbps-install")
                    (search . "xbps-query -Rs")
                    (uninstall . "xbps-remove -R")
-                   (update . ("xbps-install -Su"))
+                   (update . "xbps-install -Su")
                    (clean-cache . "xbps-remove -O")
                    (log . nil)
                    (get-info . "xbps-query")
@@ -298,7 +298,7 @@
                    (list-dependencies-of . "xbps-query -x")
                    (noconfirm . nil))))
   "An alist of package manager commands.
-The key is the package manager and values (usually) commands.")
+The key is the package manager and value (usually) the shell command to run.")
 (put 'system-packages-supported-package-managers 'risky-local-variable t)
 
 (define-obsolete-variable-alias 'system-packages-packagemanager
@@ -360,9 +360,6 @@ of passing additional arguments to the package manager."
                                              
system-packages-supported-package-managers)))))))
     (unless command
       (error (format "%S not supported in %S" action 
system-packages-package-manager)))
-    (unless (listp command)
-      (setq command (list command)))
-    (setq command (mapconcat #'identity command " && "))
     (setq command (mapconcat #'identity (list command pack) " "))
     (when noconfirm
       (setq args (concat args (and pack " ") noconfirm)))