Skip to content

Commit 7067659

Browse files
committed
refactor: Accept rest for archive install
1 parent 97403af commit 7067659

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

docs/content/Development-API/_index.en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,15 +284,15 @@ The argument `ARCHIVES` can either be a string or a list of strings.
284284
💡 This is handy when you need certain packages from certain archives.
285285
{{< /hint >}}
286286

287-
## 🔍 Function: eask-archive-install-packages (`archives` `names`)
287+
## 🔍 Function: eask-archive-install-packages (`archives` &rest `names`)
288288

289289
Install packages with archives setup.
290290

291291
The arugment `names` can be a symbol or list of symbols.
292292

293293
```elisp
294294
(eask-archive-install-packages '("gnu" "melpa")
295-
'el2org) ; accept list
295+
'el2org) ; Accept multiple arguments.
296296
```
297297

298298
{{< hint info >}}

docs/content/Development-API/_index.zh-tw.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,15 +281,15 @@ eask init
281281
💡 當您需要某些存檔中的特定套件時,這非常方便。
282282
{{< /hint >}}
283283

284-
## 🔍 函式: eask-archive-install-packages (`archives` `names`)
284+
## 🔍 函式: eask-archive-install-packages (`archives` &rest `names`)
285285

286286
使用 archives 設定安裝套件。
287287

288288
參數 `names` 可以是符號或符號列表。
289289

290290
```elisp
291291
(eask-archive-install-packages '("gnu" "melpa")
292-
'el2org) ; 接受列表
292+
'el2org) ; 接受多個參數.
293293
```
294294

295295
{{< hint info >}}

lisp/_prepare.el

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -708,11 +708,10 @@ Argument BODY are forms for execution."
708708
"done ✓"))
709709
,@body))
710710

711-
(defun eask-archive-install-packages (archives names)
711+
(defun eask-archive-install-packages (archives &rest names)
712712
"Install package NAMES with ARCHIVES setup."
713713
(eask-defvc< 27 (eask-pkg-init)) ; XXX: remove this after we drop 26.x
714-
(when-let* ((names (eask-listify names))
715-
((cl-some (lambda (pkg) (not (package-installed-p pkg))) names)))
714+
(when (cl-some (lambda (pkg) (not (package-installed-p pkg))) names)
716715
(eask-with-archives archives
717716
(eask--package-mapc #'eask-package-install names))))
718717

lisp/generate/test/buttercup.el

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242

4343
(eask-start
4444
(eask-archive-install-packages '("gnu" "melpa")
45-
'(buttercup f))
45+
'buttercup
46+
'f)
4647
(require 'buttercup)
4748
(require 'f)
4849
(eask-generate-test-buttercup--init (eask-guess-package-name)))

lisp/init/cask.el

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ Optional argument CONTENTS is used for nested directives. e.g. development."
209209
(eask-start
210210
;; Preparation
211211
(eask-archive-install-packages '("gnu" "melpa" "jcs-elpa")
212-
'(package-build cask))
212+
'package-build
213+
'cask)
213214

214215
;; Start Converting
215216
(require 'cask)

lisp/test/melpazoid.el

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
(eask-start
3232
;; Preparation
3333
(eask-archive-install-packages '("gnu" "melpa")
34-
'(package-lint pkg-info))
34+
'package-lint
35+
'pkg-info)
3536

3637
;; Start Testing
3738
(let* ((dirs (or (eask-args) `(,default-directory))))

0 commit comments

Comments
 (0)