Skip to content

Commit 4aa327b

Browse files
committed
code: update logic for pkg-file command
1 parent b596bf7 commit 4aa327b

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

lisp/_prepare.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ Eask file in the workspace."
614614
(insert-file-contents eask-package-file)
615615
(setq eask-package-desc (ignore-errors (package-buffer-info))))
616616
(unless eask-package-desc
617-
(eask-warn "Failed to construct buffer-info, try to lint the package-file `%s'" file)))
617+
(eask-warn "Failed to construct package-descriptor, lint the package-file `%s'" file)))
618618
(eask-warn "Missing the package-file `%s'" file))))
619619

620620
(defun eask-files (&rest patterns)

lisp/core/pkg-file.el

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@
1515
nil t)
1616

1717
(eask-start
18-
(let* ((name (eask-guess-package-name))
19-
(version (eask-package-version))
20-
(description (eask-package-description))
21-
(reqs (package-desc-reqs eask-package-desc))
22-
(pkg-file (expand-file-name (concat name "-pkg.el"))))
23-
(write-region
24-
(pp-to-string `(define-package ,name ,version ,description ,reqs))
25-
nil pkg-file)
26-
(eask-info "(Generated pkg-file -> %s)" pkg-file)))
18+
(let ((pkg-file (expand-file-name (concat name "-pkg.el"))))
19+
(if eask-package-desc
20+
(package-generate-description-file eask-package-desc pkg-file))
21+
(let* ((name (eask-guess-package-name))
22+
(version (eask-package-version))
23+
(description (eask-package-description))
24+
(reqs (package-desc-reqs eask-package-desc)))
25+
(write-region
26+
(pp-to-string `(define-package ,name ,version ,description ',reqs))
27+
nil pkg-file)))
28+
(eask-info "(Generated pkg-file -> %s)" pkg-file))
2729

2830
;;; pkg-file.el ends here

0 commit comments

Comments
 (0)