mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-10-18 16:05:47 +00:00
Code Issues 1 Releases Wiki Activity

Improve error messages in bundle/add if files are missing.

Browse Source 
Instead of cryptic "error: unknown method :close invoked on nil" errors, let
user know file or path does not exist before failing to copy files.
This commit is contained in:
Calvin Rose 2024-09-07 09:18:08 -05:00
parent 384ee4f6a9
commit 1fcd47dd7b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/boot/boot.janet
View File

@ -4057,6 +4057,7 @@
(defn- copyfile (defn- copyfile
[from to] [from to]
(def mode (os/stat from :permissions)) (def mode (os/stat from :permissions))
(if-not mode (errorf "file %s does not exist" from))
(def b (buffer/new 0x10000)) (def b (buffer/new 0x10000))
(with [ffrom (file/open from :rb)] (with [ffrom (file/open from :rb)]
(with [fto (file/open to :wb)] (with [fto (file/open to :wb)]
@ -4382,12 +4383,15 @@
[manifest src &opt dest chmod-mode] [manifest src &opt dest chmod-mode]
(default dest src) (default dest src)
(def s (sep)) (def s (sep))
(case (os/stat src :mode) (def mode (os/stat src :mode))
(if-not mode (errorf "file %s does not exist" src))
(case mode
:directory :directory
(let [absdest (bundle/add-directory manifest dest chmod-mode)] (let [absdest (bundle/add-directory manifest dest chmod-mode)]
(each d (os/dir src) (bundle/add manifest (string src s d) (string dest s d) chmod-mode)) (each d (os/dir src) (bundle/add manifest (string src s d) (string dest s d) chmod-mode))
absdest) absdest)
:file (bundle/add-file manifest src dest chmod-mode))) :file (bundle/add-file manifest src dest chmod-mode)
(errorf "bad path %s - file is a %s" src mode)))
(defn bundle/add-bin (defn bundle/add-bin
`Shorthand for adding scripts during an install. Scripts will be installed to `Shorthand for adding scripts during an install. Scripts will be installed to