+30
-13
lines changedFilter options
+30
-13
lines changed Original file line number Diff line number Diff line change
@@ -20,6 +20,8 @@
20 20
(locate-dominating-file dir "_prepare.el"))
21 21
nil t))
22 22 23 +
(eask-load "core/install")
24 + 23 25
(defun eask-install-file--guess-name (file)
24 26
"Guess the package name of the install FILE."
25 27
(file-name-sans-extension (file-name-nondirectory (directory-file-name file))))
@@ -32,8 +34,9 @@
32 34
(names (mapcar #'car deps))
33 35
(len (length deps))
34 36
(s (eask--sinr len "" "s"))
35 -
(pkg-not-installed (cl-remove-if #'package-installed-p names))
36 -
(installed (length pkg-not-installed)) (skipped (- len installed)))
37 +
(not-installed (eask-install--not-installed names))
38 +
(installed (length not-installed))
39 +
(skipped (- len installed)))
37 40
(eask-log "Installing %s specified file package%s..." len s)
38 41
(eask-msg "")
39 42
(eask--package-mapc (lambda (dep &rest _)
@@ -20,6 +20,7 @@
20 20
(locate-dominating-file dir "_prepare.el"))
21 21
nil t))
22 22 23 +
(eask-load "core/install")
23 24
(eask-load "core/install-file")
24 25 25 26
(defun eask-install-vc--split-sepcs (specs)
@@ -44,8 +45,9 @@
44 45
(names (mapcar #'car deps))
45 46
(len (length deps))
46 47
(s (eask--sinr len "" "s"))
47 -
(pkg-not-installed (cl-remove-if #'package-installed-p names))
48 -
(installed (length pkg-not-installed)) (skipped (- len installed)))
48 +
(not-installed (eask-install--not-installed names))
49 +
(installed (length not-installed))
50 +
(skipped (- len installed)))
49 51
(eask-log "Installing %s specified vc package%s..." len s)
50 52
(eask-msg "")
51 53
(eask--package-mapc (lambda (dep &rest _)
@@ -23,12 +23,22 @@
23 23 24 24
(eask-load "core/package") ; load dist path
25 25 26 -
(defun eask-install-packages (names)
26 +
(defun eask-install--not-installed (names)
27 +
"Return a list of not installed packages' NAMES."
28 +
(cl-remove-if-not
29 +
(lambda (name)
30 +
(or (eask-force-p)
31 +
(not (package-installed-p (eask-intern name)))))
32 +
names))
33 + 34 +
(defun eask-install--packages (names)
27 35
"Install packages with their NAMES."
28 36
(let* ((names (mapcar #'eask-intern names))
29 -
(len (length names)) (s (eask--sinr len "" "s"))
30 -
(pkg-not-installed (cl-remove-if #'package-installed-p names))
31 -
(installed (length pkg-not-installed)) (skipped (- len installed)))
37 +
(len (length names))
38 +
(s (eask--sinr len "" "s"))
39 +
(not-installed (eask-install--not-installed names))
40 +
(installed (length not-installed))
41 +
(skipped (- len installed)))
32 42
(eask-log "Installing %s specified package%s..." len s)
33 43
(eask-msg "")
34 44
(eask--package-mapc #'eask-package-install names)
@@ -80,7 +90,7 @@ For argument FILE, please see function `package-install-file' for the details."
80 90
(eask-pkg-init)
81 91
(if-let* ((names (eask-args)))
82 92
;; If package [name..] are specified, we try to install it
83 -
(eask-install-packages names)
93 +
(eask-install--packages names)
84 94
;; Else we try to install package from the working directory
85 95
(eask-install-dependencies)
86 96
(let* ((name (eask-guess-package-name))
@@ -24,9 +24,11 @@
24 24
(defun eask-reinstall--packages (names)
25 25
"Install packages by its NAMES."
26 26
(let* ((names (mapcar #'eask-intern names))
27 -
(len (length names)) (s (eask--sinr len "" "s"))
28 -
(pkg-not-installed (cl-remove-if #'package-installed-p names))
29 -
(installed (length pkg-not-installed)) (skipped (- len installed)))
27 +
(len (length names))
28 +
(s (eask--sinr len "" "s"))
29 +
(installed (cl-remove-if-not #'package-installed-p names))
30 +
(installed (length installed))
31 +
(skipped (- len installed)))
30 32
(eask-log "Reinstalling %s specified package%s..." len s)
31 33
(eask-msg "")
32 34
(eask--package-mapc #'eask-package-reinstall names)
@@ -79,7 +79,7 @@
79 79
(package-desc-version pkg-desc)))
80 80
;; XXX: Install dependencies for linked package
81 81
(eask-msg "")
82 -
(eask-install-packages (eask-link-add--package-desc-reqs pkg-desc))
82 +
(eask-install--packages (eask-link-add--package-desc-reqs pkg-desc))
83 83
(eask-link-add--create source)
84 84
(when (and (zerop (length links)) ; if no link previously,
85 85
(= 1 (length (eask-link-list)))) ; and first link created!
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4