summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob L. Kreuze <zerodaysfordays@sdf.org>2020-05-25 12:22:19 -0400
committerJakob L. Kreuze <zerodaysfordays@sdf.org>2020-05-25 12:25:40 -0400
commit83b99f00dedae6c82100b6820b18e414fec2525e (patch)
treefdfc222a1b06da4b570ee20e2b5e1257b0f8b8b8
parent8ee64b941eab28c6bad7b868ec6089fe5c7df58d (diff)
Canonicalize relative paths passed to `add`.
-rw-r--r--src/main.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.rs b/src/main.rs
index 989262f..a11d185 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -366,9 +366,9 @@ fn main() {
eprintln!("usage: {} add PATH [TAGS ...]", args[0]);
std::process::exit(1);
}
- let path = Path::new(&args[2]);
- let hash = hash_file(path).unwrap();
- let id = tb.import_image(path, &hash).unwrap();
+ let path = Path::new(&args[2]).canonicalize().unwrap();
+ let hash = hash_file(&path).unwrap();
+ let id = tb.import_image(&path, &hash).unwrap();
for arg in args[3..].iter() {
tb.add_tag(arg).unwrap();
tb.tag_image(id, arg).unwrap();
@@ -379,7 +379,7 @@ fn main() {
eprintln!("usage: {} id_for PATH ", args[0]);
std::process::exit(1);
}
- let path = Path::new(&args[2]);
+ let path = Path::new(&args[2]).canonicalize().unwrap();
println!("{}", tb.image_id(&path).unwrap());
}
"add_tags" => {