profiles location has changed

sonos · Oct 16, 2024 · e032e42 · e032e42
1 parent a7e2377
commit e032e42
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/dinghy-lib/src/apple/device.rs b/dinghy-lib/src/apple/device.rs
@@ -150,7 +150,7 @@ impl IosDevice {
             .output()?;
         let app_list = json::parse(std::str::from_utf8(&app_list.stdout)?).with_context(|| {
             format!(
-                "Ran `pymobiledevice3 app list --no-color --udid {}`, could not parse expected JSON output.", self.id,
+                "Ran `pymobiledevice3 apps list --no-color --udid {}`, could not parse expected JSON output.", self.id,
             )
         })?;
         let app_path = build_bundle.bundle_dir.to_string_lossy();

diff --git a/dinghy-lib/src/apple/xcode.rs b/dinghy-lib/src/apple/xcode.rs
@@ -118,11 +118,15 @@ pub fn look_for_signature_settings(device_id: &str) -> Result<Vec<SignatureSetti
     }
     debug!("Possible signing identities: {:?}", identities);
     let mut settings = vec![];
-    let profile_dir = dirs::home_dir()
-        .expect("can't get HOME dir")
-        .join("Library/MobileDevice/Provisioning Profiles");
-    trace!("Scanning profiles in {:?}", profile_dir);
-    for file in fs::read_dir(profile_dir)? {
+    let home = dirs::home_dir().expect("can't get HOME dir");
+    let profiles_dir = [
+        "Library/MobileDevice/Provisioning Profiles", 
+        "Library/Developer/Xcode/UserData/Provisioning Profiles", // xcode 16 and above
+    ];
+    for file in profiles_dir
+        .iter()
+        .flat_map(|path| fs::read_dir(home.join(path)).unwrap())
+    {
         let file = file?;
         if file.path().starts_with(".")
             || file