rename Desktop distribution crate to installation

This commit is contained in:
Abhinav Vedmala
2026-06-15 05:30:26 +00:00
parent 27541e9ef8
commit 9b2efe0c3a
14 changed files with 73 additions and 72 deletions
+1 -1
View File
@@ -31,7 +31,7 @@ codex-chatgpt = { workspace = true }
codex-cloud-tasks = { path = "../cloud-tasks" }
codex-utils-cli = { workspace = true }
codex-config = { workspace = true }
codex-desktop-distribution = { workspace = true }
codex-desktop-installation = { workspace = true }
codex-core = { workspace = true }
codex-core-plugins = { workspace = true }
codex-home = { workspace = true }
+8 -8
View File
@@ -1,6 +1,6 @@
use anyhow::Context as _;
use codex_desktop_distribution::discover_installed_distribution;
use codex_desktop_distribution::validate_installed_distribution_at;
use codex_desktop_installation::discover_desktop_installation;
use codex_desktop_installation::validate_desktop_installation_at;
use std::ffi::CString;
use std::path::Path;
use std::path::PathBuf;
@@ -66,10 +66,10 @@ fn is_apple_silicon_mac() -> bool {
}
async fn find_existing_codex_app_path() -> anyhow::Result<Option<PathBuf>> {
let distribution = tokio::task::spawn_blocking(discover_installed_distribution)
let installation = tokio::task::spawn_blocking(discover_desktop_installation)
.await
.context("Desktop discovery task failed")??;
Ok(distribution.map(|distribution| distribution.app_root().to_path_buf()))
Ok(installation.map(|installation| installation.app_root().to_path_buf()))
}
async fn open_codex_app(app_path: &Path, workspace: &Path) -> anyhow::Result<()> {
@@ -174,15 +174,15 @@ async fn install_codex_app_bundle(app_in_volume: &Path) -> anyhow::Result<PathBu
async fn validate_installed_codex_app(app_path: PathBuf) -> anyhow::Result<PathBuf> {
let candidate = app_path.clone();
let distribution =
tokio::task::spawn_blocking(move || validate_installed_distribution_at(candidate))
let installation =
tokio::task::spawn_blocking(move || validate_desktop_installation_at(candidate))
.await
.context("Desktop validation task failed")??;
let app_path_display = app_path.display();
let distribution = distribution.with_context(|| {
let installation = installation.with_context(|| {
format!("refusing to launch unverified Codex Desktop at {app_path_display}")
})?;
Ok(distribution.app_root().to_path_buf())
Ok(installation.app_root().to_path_buf())
}
fn candidate_applications_dirs() -> anyhow::Result<Vec<PathBuf>> {
+2 -2
View File
@@ -1,5 +1,5 @@
use anyhow::Context as _;
use codex_desktop_distribution::discover_installed_distribution;
use codex_desktop_installation::discover_desktop_installation;
use std::path::Path;
use std::path::PathBuf;
use tokio::process::Command;
@@ -32,7 +32,7 @@ pub async fn run_windows_app_open_or_install(
}
async fn codex_app_is_installed() -> anyhow::Result<bool> {
Ok(tokio::task::spawn_blocking(discover_installed_distribution)
Ok(tokio::task::spawn_blocking(discover_desktop_installation)
.await
.context("Desktop discovery task failed")??
.is_some())