diff --git a/lisp/init/cask.el b/lisp/init/cask.el index b5856994..4ea622a9 100644 --- a/lisp/init/cask.el +++ b/lisp/init/cask.el @@ -108,17 +108,16 @@ Optional argument CONTENTS is used for nested directives. e.g. development." (file (file-name-nondirectory (eask-root-del filename))) (new-file (eask-s-replace "Cask" "Eask" file)) (new-filename (expand-file-name new-file)) - (eask--cask-contents (cask--read filename)) ; Read it! + (eask--cask-contents (ignore-errors (cask--read filename))) ; Read it! (converted)) (eask-with-progress (format "Converting file `%s` to `%s`... " file new-file) (eask-with-verbosity 'debug (cond ((not (string-prefix-p "Cask" file)) (eask-debug "✗ Invalid Cask filename, the file should start with `Cask`")) - ((file-exists-p new-filename) - (eask-debug "✗ The file `%s` already presented" new-file)) (t (with-current-buffer (find-file new-filename) + (erase-buffer) (goto-char (point-min)) ;; XXX: Newline to look nicer! @@ -164,7 +163,9 @@ Optional argument CONTENTS is used for nested directives. e.g. development." (files (if (stringp files) files (-flatten files)))) (insert "(files") (dolist (file files) - (insert "\n \"" file "\"")) + (if (stringp file) + (insert "\n \"" file "\"") + (insert "\n " (eask-2str file)))) (insert ")\n")) (when-let ((pkg-desc (eask--cask-package-descriptor))) diff --git a/lisp/init/keg.el b/lisp/init/keg.el index 8205f45f..fbaa7d1a 100644 --- a/lisp/init/keg.el +++ b/lisp/init/keg.el @@ -48,17 +48,16 @@ If no found the Keg file, returns nil." (file (file-name-nondirectory (eask-root-del filename))) (new-file (eask-s-replace "Keg" "Eask" file)) (new-filename (expand-file-name new-file)) - (contents (eask--keg-file-read filename)) ; Read it! + (contents (ignore-errors (eask--keg-file-read filename))) ; Read it! (converted)) (eask-with-progress (format "Converting file `%s` to `%s`... " file new-file) (eask-with-verbosity 'debug (cond ((not (string-prefix-p "Keg" file)) (eask-debug "✗ Invalid Keg filename, the file should start with `Keg`")) - ((file-exists-p new-filename) - (eask-debug "✗ The file `%s` already presented" new-file)) (t (with-current-buffer (find-file new-filename) + (erase-buffer) (goto-char (point-min)) (let* ((project-name (file-name-nondirectory (directory-file-name default-directory)))