fix: search all on-disk indexes for os-compatible packages

Author: rmitchellscott

bootstrap.sh

@@ -216,7 +216,7 @@ trap - EXIT
 
 echo ""
 echo "Vellum installed successfully!"
-echo "Run 'source ~/.bashrc' or start a new shell to use vellum."
+echo "Run 'exec bash --login' to use vellum."
 if [ -n "$OFFLINE_DIR" ]; then
     echo ""
     echo "Offline install complete. When network is available, run:"

src/commands/add.rs

@@ -80,20 +80,27 @@ fn run_add_directly(apk: &Apk, args: &[String]) {
 
 fn get_index() -> anyhow::Result<Vec<Package>> {
     let cache_dir = format!("{VELLUM_ROOT}/etc/apk/cache");
+    let mut all_packages = Vec::new();
 
     if let Ok(entries) = fs::read_dir(&cache_dir) {
         for entry in entries.flatten() {
             let path = entry.path();
             if let Some(name) = path.file_name().and_then(|n| n.to_str()) {
                 if name.starts_with("APKINDEX.") && name.ends_with(".tar.gz") {
                     if let Some(path_str) = path.to_str() {
-                        return parse_index_tar_gz(path_str);
+                        if let Ok(packages) = parse_index_tar_gz(path_str) {
+                            all_packages.extend(packages);
+                        }
                     }
                 }
             }
         }
     }
 
+    if !all_packages.is_empty() {
+        return Ok(all_packages);
+    }
+
     let repo_url = match get_repo_url() {
         Some(url) => url,
         None => return Err(anyhow::anyhow!("no cached index and could not determine repository URL")),

src/commands/check_os.rs

@@ -96,20 +96,27 @@ pub fn handle_check_os(apk: &Apk, target_os: &str) {
 
 fn get_index() -> anyhow::Result<Vec<Package>> {
     let cache_dir = format!("{VELLUM_ROOT}/etc/apk/cache");
+    let mut all_packages = Vec::new();
 
     if let Ok(entries) = fs::read_dir(&cache_dir) {
         for entry in entries.flatten() {
             let path = entry.path();
             if let Some(name) = path.file_name().and_then(|n| n.to_str()) {
                 if name.starts_with("APKINDEX.") && name.ends_with(".tar.gz") {
                     if let Some(path_str) = path.to_str() {
-                        return parse_index_tar_gz(path_str);
+                        if let Ok(packages) = parse_index_tar_gz(path_str) {
+                            all_packages.extend(packages);
+                        }
                     }
                 }
             }
         }
     }
 
+    if !all_packages.is_empty() {
+        return Ok(all_packages);
+    }
+
     let repo_url = get_repo_url().ok_or_else(|| {
         anyhow::anyhow!("no cached index and could not determine repository URL")
     })?;

src/commands/upgrade.rs

@@ -225,20 +225,27 @@ fn check_os_compatibility_internal(apk: &Apk, target_os: &str) -> Option<Vec<Str
 
 fn get_index() -> anyhow::Result<Vec<Package>> {
     let cache_dir = format!("{VELLUM_ROOT}/etc/apk/cache");
+    let mut all_packages = Vec::new();
 
     if let Ok(entries) = fs::read_dir(&cache_dir) {
         for entry in entries.flatten() {
             let path = entry.path();
             if let Some(name) = path.file_name().and_then(|n| n.to_str()) {
                 if name.starts_with("APKINDEX.") && name.ends_with(".tar.gz") {
                     if let Some(path_str) = path.to_str() {
-                        return parse_index_tar_gz(path_str);
+                        if let Ok(packages) = parse_index_tar_gz(path_str) {
+                            all_packages.extend(packages);
+                        }
                     }
                 }
             }
         }
     }
 
+    if !all_packages.is_empty() {
+        return Ok(all_packages);
+    }
+
     let repo_url = match get_repo_url() {
         Some(url) => url,
         None => return Err(anyhow::anyhow!("no cached index and could not determine repository URL")),