fix(install): Package installed calculation

Author: jcs090218

lisp/core/install-file.el

@@ -20,6 +20,8 @@
                           (locate-dominating-file dir "_prepare.el"))
         nil t))
 
+(eask-load "core/install")
+
 (defun eask-install-file--guess-name (file)
   "Guess the package name of the install FILE."
   (file-name-sans-extension (file-name-nondirectory (directory-file-name file))))
@@ -32,8 +34,9 @@
          (names (mapcar #'car deps))
          (len (length deps))
          (s (eask--sinr len "" "s"))
-         (pkg-not-installed (cl-remove-if #'package-installed-p names))
-         (installed (length pkg-not-installed)) (skipped (- len installed)))
+         (not-installed (eask-install--not-installed names))
+         (installed (length not-installed))
+         (skipped (- len installed)))
     (eask-log "Installing %s specified file package%s..." len s)
     (eask-msg "")
     (eask--package-mapc (lambda (dep &rest _)

lisp/core/install-vc.el

@@ -20,6 +20,7 @@
                           (locate-dominating-file dir "_prepare.el"))
         nil t))
 
+(eask-load "core/install")
 (eask-load "core/install-file")
 
 (defun eask-install-vc--split-sepcs (specs)
@@ -44,8 +45,9 @@
          (names (mapcar #'car deps))
          (len (length deps))
          (s (eask--sinr len "" "s"))
-         (pkg-not-installed (cl-remove-if #'package-installed-p names))
-         (installed (length pkg-not-installed)) (skipped (- len installed)))
+         (not-installed (eask-install--not-installed names))
+         (installed (length not-installed))
+         (skipped (- len installed)))
     (eask-log "Installing %s specified vc package%s..." len s)
     (eask-msg "")
     (eask--package-mapc (lambda (dep &rest _)

lisp/core/install.el

@@ -23,12 +23,22 @@
 
 (eask-load "core/package")  ; load dist path
 
-(defun eask-install-packages (names)
+(defun eask-install--not-installed (names)
+  "Return a list of not installed packages' NAMES."
+  (cl-remove-if-not
+   (lambda (name)
+     (or (eask-force-p)
+         (not (package-installed-p (eask-intern name)))))
+   names))
+
+(defun eask-install--packages (names)
   "Install packages with their NAMES."
   (let* ((names (mapcar #'eask-intern names))
-         (len (length names)) (s (eask--sinr len "" "s"))
-         (pkg-not-installed (cl-remove-if #'package-installed-p names))
-         (installed (length pkg-not-installed)) (skipped (- len installed)))
+         (len (length names))
+         (s (eask--sinr len "" "s"))
+         (not-installed (eask-install--not-installed names))
+         (installed (length not-installed))
+         (skipped (- len installed)))
     (eask-log "Installing %s specified package%s..." len s)
     (eask-msg "")
     (eask--package-mapc #'eask-package-install names)
@@ -80,7 +90,7 @@ For argument FILE, please see function `package-install-file' for the details."
   (eask-pkg-init)
   (if-let* ((names (eask-args)))
       ;; If package [name..] are specified, we try to install it
-      (eask-install-packages names)
+      (eask-install--packages names)
     ;; Else we try to install package from the working directory
     (eask-install-dependencies)
     (let* ((name (eask-guess-package-name))

lisp/core/reinstall.el

@@ -24,9 +24,11 @@
 (defun eask-reinstall--packages (names)
   "Install packages by its NAMES."
   (let* ((names (mapcar #'eask-intern names))
-         (len (length names)) (s (eask--sinr len "" "s"))
-         (pkg-not-installed (cl-remove-if #'package-installed-p names))
-         (installed (length pkg-not-installed)) (skipped (- len installed)))
+         (len (length names))
+         (s (eask--sinr len "" "s"))
+         (installed (cl-remove-if-not #'package-installed-p names))
+         (installed (length installed))
+         (skipped (- len installed)))
     (eask-log "Reinstalling %s specified package%s..." len s)
     (eask-msg "")
     (eask--package-mapc #'eask-package-reinstall names)

lisp/link/add.el

@@ -79,7 +79,7 @@
                                                 (package-desc-version pkg-desc)))
           ;; XXX: Install dependencies for linked package
           (eask-msg "")
-          (eask-install-packages (eask-link-add--package-desc-reqs pkg-desc))
+          (eask-install--packages (eask-link-add--package-desc-reqs pkg-desc))
           (eask-link-add--create source)
           (when (and (zerop (length links))         ; if no link previously,
                      (= 1 (length (eask-link-list))))  ; and first link created!