add a check for xcrun present, but no devicectl

sonos · Apr 11, 2024 · 7904ea4 · 7904ea4
1 parent a1f7d33
commit 7904ea4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/dinghy-lib/src/apple/mod.rs b/dinghy-lib/src/apple/mod.rs
@@ -244,6 +244,10 @@ fn devices() -> Result<Vec<Box<dyn Device>>> {
         log::warn!("xcrun not found. Apple devices support disabled. Consider installing XCode and its command line tools.");
         return Ok(vec!())
     }
+    if !std::process::Command::new("xcrun").arg("--find").arg("devicectl").output()?.status.success() {
+        log::warn!("xcrun devicectl not found. Apple devices support disabled. Consider updating XCode and its command line tools.");
+        return Ok(vec!())
+    }
     devices_from_devicectl(&mut devices)?;
     devices_from_ios_deploy(&mut devices)?;
     Ok(devices