fix: use absolute paths everywhere (#836)

Otherwise it is not possible to add things if the add cli has a different $PATH than the daemon.
n0-computer · Mar 14, 2023 · b2730ee · b2730ee
1 parent 7e5ac39
commit b2730ee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/main.rs b/src/main.rs
@@ -374,8 +374,9 @@ async fn main_impl() -> Result<()> {
             // task that will add data to the provider, either from a file or from stdin
             let fut = tokio::spawn(async move {
                 let (path, tmp_path) = if let Some(path) = path {
-                    println!("Adding {}...", path.display());
-                    (path, None)
+                    let absolute = path.canonicalize()?;
+                    println!("Adding {} as {}...", path.display(), absolute.display());
+                    (absolute, None)
                 } else {
                     // Store STDIN content into a temporary file
                     let (file, path) = tempfile::NamedTempFile::new()?.into_parts();
@@ -445,9 +446,10 @@ async fn main_impl() -> Result<()> {
         }
         Commands::Add { path, rpc_port } => {
             let client = make_rpc_client(rpc_port).await?;
-            println!("Adding {}...", path.display());
+            let absolute = path.canonicalize()?;
+            println!("Adding {} as {}...", path.display(), absolute.display());
             let ProvideResponse { hash, entries } =
-                client.rpc(ProvideRequest { path: path.clone() }).await??;
+                client.rpc(ProvideRequest { path: absolute }).await??;
             print_add_response(hash, entries);
             Ok(())
         }