Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
+13
-13
@@ -13,14 +13,14 @@ use std::{
|
||||
str,
|
||||
time::Duration,
|
||||
};
|
||||
use warp_core::safe_error;
|
||||
use galaxy_core::safe_error;
|
||||
|
||||
use anyhow::{anyhow, bail, ensure, Context, Result};
|
||||
use channel_versions::VersionInfo;
|
||||
use nix::unistd::{fchown, getgid};
|
||||
use nix::{errno::Errno, unistd::getuid};
|
||||
use warp_core::macos::get_bundle_path;
|
||||
use warpui::{AppContext, ModelContext, SingletonEntity};
|
||||
use galaxy_core::macos::get_bundle_path;
|
||||
use galaxyui::{AppContext, ModelContext, SingletonEntity};
|
||||
|
||||
use crate::{
|
||||
appearance::AppearanceManager,
|
||||
@@ -45,7 +45,7 @@ const OLD_EXECUTABLE_FILE_NAME: &str = "old";
|
||||
const PERMISSIONS_TMP_FILE_NAME: &str = "permission_test";
|
||||
|
||||
fn old_executable_file_path() -> PathBuf {
|
||||
warp_core::paths::state_dir().join(OLD_EXECUTABLE_FILE_NAME)
|
||||
galaxy_core::paths::state_dir().join(OLD_EXECUTABLE_FILE_NAME)
|
||||
}
|
||||
|
||||
/// Removes the old executable dir from the app bundle. This is necessary because after an
|
||||
@@ -143,7 +143,7 @@ pub(super) fn relaunch() -> Result<()> {
|
||||
launch_command.push(bundle_path.as_os_str());
|
||||
// Pass a flag to the app to let it know it was restarted as part of the
|
||||
// autoupdate process.
|
||||
launch_command.push(format!(" --args {}", warp_cli::finish_update_flag()));
|
||||
launch_command.push(format!(" --args {}", galaxy_cli::finish_update_flag()));
|
||||
// If we're testing with a local copy of channel_versions.json, have the
|
||||
// newly-started binary also reference that same file (so we can test
|
||||
// displaying an updated changelog after an autoupdate).
|
||||
@@ -190,7 +190,7 @@ pub async fn cleanup(update_id: &str) {
|
||||
/// This helps prevent accumulation of old update directories from failed downloads,
|
||||
/// race conditions, or incomplete cleanups.
|
||||
pub async fn cleanup_all_except(preserve_update_id: Option<&str>) {
|
||||
let mut autoupdate_dir = warp_core::paths::cache_dir();
|
||||
let mut autoupdate_dir = galaxy_core::paths::cache_dir();
|
||||
autoupdate_dir.push("autoupdate");
|
||||
|
||||
if !autoupdate_dir.exists() {
|
||||
@@ -315,7 +315,7 @@ async fn verify_code_signature(component: &str, path: &Path) -> Result<()> {
|
||||
.arg("-v")
|
||||
.arg(format!(
|
||||
"-R=certificate leaf[subject.OU] = \"{}\"",
|
||||
warp_core::macos::APPLE_TEAM_ID
|
||||
galaxy_core::macos::APPLE_TEAM_ID
|
||||
))
|
||||
.arg(path)
|
||||
.output()
|
||||
@@ -664,7 +664,7 @@ async fn download_dmg(
|
||||
}
|
||||
|
||||
fn get_download_dir(update_id: &str) -> PathBuf {
|
||||
let mut dir = warp_core::paths::cache_dir();
|
||||
let mut dir = galaxy_core::paths::cache_dir();
|
||||
dir.push("autoupdate");
|
||||
dir.push(update_id);
|
||||
dir
|
||||
@@ -732,12 +732,12 @@ fn dmg_name(channel: Channel) -> String {
|
||||
|
||||
fn app_name_prefix(channel: Channel) -> &'static str {
|
||||
match channel {
|
||||
Channel::Stable => "Warp",
|
||||
Channel::Preview => "WarpPreview",
|
||||
Channel::Local => "warp",
|
||||
Channel::Stable => "GalaxyAI",
|
||||
Channel::Preview => "GalaxyAIPreview",
|
||||
Channel::Local => "galaxy-ai",
|
||||
Channel::Integration => "integration",
|
||||
Channel::Dev => "WarpDev",
|
||||
Channel::Oss => "warp-oss",
|
||||
Channel::Dev => "GalaxyAIDev",
|
||||
Channel::Oss => "galaxy-ai-oss",
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user