Don't warn when the tarball has already been unpacked

Author: smoelius

.github/workflows/ci.yml

@@ -112,7 +112,6 @@ jobs:
             yarn
             wget --quiet https://github.com/trail-of-forks/sbpf-coverage/releases/download/$AGAVE_TAG/patched-agave-tools-$AGAVE_TAG-Linux.tar.gz
             tar xzf patched-agave-tools-$AGAVE_TAG-Linux.tar.gz
-            rm -f patched-agave-tools-$AGAVE_TAG-Linux.tar.gz
             PATH="$PWD/patched-agave-tools-$AGAVE_TAG-Linux/bin:$PATH"
             anchor test
             popd

src/tests.rs

@@ -4,7 +4,7 @@ use assert_cmd::cargo::CommandCargoExt;
 use std::{
     collections::HashSet,
     env::current_dir,
-    fs::{read_to_string, remove_file},
+    fs::read_to_string,
     path::{Path, PathBuf},
     process::Command,
     sync::{LazyLock, Mutex, MutexGuard},
@@ -242,8 +242,6 @@ fn download_patched_agave_tools(dir: impl AsRef<Path>) -> Result<()> {
     let status = command.status()?;
     ensure!(status.success(), "command failed: {command:?}");
 
-    remove_file(dir.as_ref().join(filename))?;
-
     Ok(())
 }
 

src/util/mod.rs

@@ -25,16 +25,20 @@ pub fn patched_agave_tools(path: impl AsRef<Path>) -> Result<Option<PathBuf>> {
     for result in read_dir(path)? {
         let entry = result?;
         let path = entry.path();
-        let Some(file_name) = path.file_name() else {
+        let Some(file_name) = path.file_name().and_then(OsStr::to_str) else {
             continue;
         };
-        if file_name
-            .to_str()
-            .is_none_or(|s| !s.starts_with("patched-agave-tools-"))
-        {
+        if !file_name.starts_with("patched-agave-tools-") {
             continue;
         }
         if !path.is_dir() {
+            // smoelius: Don't warn if there is an adjacent directory with the same basename.
+            if let Some(file_stem) = file_name.strip_suffix(".tar.gz")
+                && let Some(parent) = path.parent()
+                && parent.join(file_stem).is_dir()
+            {
+                continue;
+            }
             eprintln!(
                 "Warning: Found `{}` but it is not a directory. If it contains patched Agave \
                  tools that you want to use, please unzip and untar it.",