[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/system-packages 4f82d24 092/117: Fix missing space befo
From: |
Stefan Monnier |
Subject: |
[elpa] externals/system-packages 4f82d24 092/117: Fix missing space before a nonconfirm option |
Date: |
Fri, 14 Dec 2018 17:02:15 -0500 (EST) |
branch: externals/system-packages
commit 4f82d2499c9c25029e166ed62724eb18e11a08da
Author: Artyom Khramov <address@hidden>
Commit: Artyom Khramov <address@hidden>
Fix missing space before a nonconfirm option
Currently `system-packages-get-command` does not put a space before a
nonconfirm option and it results in incorrect command, so instead of
```sh
sudo apt-get install rg -y
```
We receive
```sh
sudo apt-get install rg-y
```
This change adds an additional space before noconfirm option if `PACK`
parameter was provided.
---
system-packages.el | 6 +++---
test/system-packages-test.el | 8 +++++++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/system-packages.el b/system-packages.el
index 220984f..9312fa5 100644
--- a/system-packages.el
+++ b/system-packages.el
@@ -328,9 +328,9 @@ of passing additional arguments to the package manager."
(setq command (mapcar (lambda (part) (concat "sudo " part)) command)))
(setq command (mapconcat 'identity command " && "))
(setq command (mapconcat 'identity (list command pack) " "))
- (setq args (concat args noconfirm))
- (when args
- (setq command (concat command args)))))
+ (when noconfirm
+ (setq args (concat args (and pack " ") noconfirm)))
+ (concat command args)))
(defun system-packages--run-command (action &optional pack args)
"Run a command asynchronously using the system's package manager.
diff --git a/test/system-packages-test.el b/test/system-packages-test.el
index 4360a4a..67b1d7a 100644
--- a/test/system-packages-test.el
+++ b/test/system-packages-test.el
@@ -33,7 +33,13 @@
(system-packages-use-sudo t)
(system-packages-package-manager 'pacman))
(system-packages-get-command 'install))
- "sudo pacman -S --noconfirm")))
+ "sudo pacman -S --noconfirm"))
+ (should (string=
+ (let ((system-packages-noconfirm t)
+ (system-packages-use-sudo t)
+ (system-packages-package-manager 'apt))
+ (system-packages-get-command 'install "rg"))
+ "sudo apt-get install rg -y")))
(ert-deftest system-packages-errors ()
"Error when we don't know a command."
- [elpa] externals/system-packages e821fa2 056/117: Drop support for pacaur, (continued)
- [elpa] externals/system-packages e821fa2 056/117: Drop support for pacaur, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages ce34019 066/117: Update travis to use latest Emacs release, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages ede298f 094/117: Add system-packages-ensure, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages f85a7bf 083/117: Remove unneeded :group statements, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages ec3ca7a 078/117: Fix brew list, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages ed5d9cc 082/117: Improve system-packages-package-manager :type defcustom, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages 04e2f7f 087/117: Make travis run tests, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages e4551fc 079/117: Add initial support for guix, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages df01469 113/117: Ensure a space between command and args, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages 453802c 110/117: Add cache cleaning commands for nix and guix, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages 4f82d24 092/117: Fix missing space before a nonconfirm option,
Stefan Monnier <=
- [elpa] externals/system-packages fff67d1 084/117: README: add guix, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages b504534 115/117: Revert "Ensure a space between command and args", Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages 41c294b 112/117: Fix tests, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages 41933fb 107/117: Add support for yum package management, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages 9a8c3a9 099/117: Move CI to gitlab, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages 78fd4c0 062/117: Initial support for nix, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages 936bb1a 064/117: `system-packages-usesudo' to `system-packages-use-sudo', Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages bd51c53 069/117: travis: spit out Emacs version, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages 5cc9ce7 072/117: Change brew upgrade --all to brew upgrade, Stefan Monnier, 2018/12/14
- [elpa] externals/system-packages 2046209 080/117: Make system-packages-supported-package-managers a defvar, Stefan Monnier, 2018/12/14