public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

first pass of merging in warp (doesn't build)

Browse Source
This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/workspace/cli_install.rs
+121 -53
View File
@@ -7,11 +7,54 @@ use command::blocking::Command;
use galaxy_core::channel::ChannelState;
use galaxy_util::path::ShellFamily;
/// Compute the target path where the symlink should be installed, based on channel
fn cli_install_target_path() -> PathBuf {
/// Compute the target path where the Oz CLI symlink should be installed, based on channel
fn oz_install_target_path() -> PathBuf {
PathBuf::from("/usr/local/bin").join(ChannelState::channel().cli_command_name())
}
/// Compute the target path where the Warp Control symlink should be installed, based on channel
fn warpctrl_install_target_path() -> PathBuf {
PathBuf::from("/usr/local/bin").join(ChannelState::channel().warpctrl_command_name())
}
/// Compute the source path of the warpctrl wrapper inside the current app bundle.
///
/// Oz commands are part of the shared executable's normal argument parser, so
/// Oz can symlink directly to the current executable. Warp Control has a
/// separate parser selected by the hidden `--warpctrl` flag, so its installed
/// symlink must target the bundled wrapper that injects that flag. Without it,
/// Warp Control subcommands such as `tab` would reach the normal parser and be
/// rejected as unknown.
fn warpctrl_bundle_source_path() -> Result<PathBuf> {
let current_binary =
std::env::current_exe().context("Failed to get current executable path")?;
let bundle_root = current_binary
.parent()
.and_then(|p| p.parent())
.and_then(|p| p.parent())
.ok_or_else(|| anyhow!("Current executable is not inside a bundled app"))?;
Ok(bundle_root
.join("Contents/Resources/bin")
.join(ChannelState::channel().warpctrl_command_name()))
}
fn path_resolves_to(path: &Path, expected_path: &Path) -> bool {
let Ok(path) = path.canonicalize() else {
return false;
};
let Ok(expected_path) = expected_path.canonicalize() else {
return false;
};
path == expected_path
}
/// Whether the installed Warp Control command resolves to this app bundle's wrapper.
pub fn is_warpctrl_installed() -> bool {
let Ok(source) = warpctrl_bundle_source_path() else {
return false;
};
path_resolves_to(&warpctrl_install_target_path(), &source)
}
/// Create a symlink with elevated privileges using osascript
///
/// This function uses macOS's osascript to prompt for administrator privileges
@@ -89,87 +132,112 @@ fn remove_file_with_admin(target: &Path) -> Result<()> {
Ok(())
}
/// Install the CLI by creating a symlink (channel-specific target)
/// Install a channel-specific CLI symlink.
///
/// This function:
/// 1. Detects the current Warp channel and finds the appropriate binary
/// 2. Attempts to create a symlink without admin privileges first
/// 3. Falls back to prompting for admin privileges if needed
/// 4. Handles existing installations and edge cases
pub fn install_cli() -> Result<()> {
let cli_path = cli_install_target_path();
let current_binary =
std::env::current_exe().context("Failed to get current executable path")?;
// Check if target file exists and handle conflicts
if cli_path.exists() && !cli_path.is_symlink() {
/// The target must either be absent or already be a symlink. Installation first
/// attempts to create the symlink without elevated privileges, then falls back
/// to prompting for administrator privileges.
fn install_symlink(source: &Path, target: &Path, command_name: &str) -> Result<()> {
if target.exists() && !target.is_symlink() {
return Err(anyhow!(
"Cannot install: {:?} exists but is not a symlink. Please remove it manually first.",
cli_path
"Cannot install {command_name}: {:?} exists but is not a symlink. Please remove it manually first.",
target
));
}
// Try to create symlink without admin privileges first
let symlink_result = symlink(&current_binary, &cli_path);
match symlink_result {
match symlink(source, target) {
Ok(_) => {
log::debug!(
"CLI installed successfully without admin privileges: {:?} -> {}",
cli_path,
current_binary.display()
"{command_name} installed successfully without admin privileges: {:?} -> {}",
target,
source.display()
);
}
Err(_) => {
log::debug!("Symlink creation failed, trying with admin privileges");
create_symlink_with_admin(&current_binary, &cli_path)
log::debug!("{command_name} symlink creation failed, trying with admin privileges");
create_symlink_with_admin(source, target)
.context("Failed to create symlink even with admin privileges")?;
log::debug!("CLI installed successfully with admin privileges");
log::debug!("{command_name} installed successfully with admin privileges");
}
}
Ok(())
}
/// Uninstall the CLI by removing the symlink (channel-specific target)
/// Uninstall a channel-specific CLI symlink.
///
/// This function:
/// 1. Verifies that the target is actually a symlink (safety check)
/// 2. Attempts to remove without admin privileges first
/// 3. Falls back to prompting for admin privileges if needed
pub fn uninstall_cli() -> Result<()> {
let cli_path = cli_install_target_path();
if !cli_path.exists() {
return Err(anyhow!("Oz command is not currently installed."));
/// The target must be a symlink so uninstalling cannot remove an unrelated
/// file. Removal first runs without elevated privileges, then falls back to
/// prompting for administrator privileges.
fn uninstall_symlink(target: &Path, command_name: &str) -> Result<()> {
if !target.exists() {
return Err(anyhow!("{command_name} is not currently installed."));
}
// Safety check: verify it's actually a symlink before removing
if !cli_path.is_symlink() {
if !target.is_symlink() {
return Err(anyhow!(
"Cannot uninstall: {:?} exists but is not a symlink. Please remove it manually.",
cli_path
"Cannot uninstall {command_name}: {:?} exists but is not a symlink. Please remove it manually.",
target
));
}
// Try to remove without admin privileges first
let remove_result = fs::remove_file(&cli_path);
match remove_result {
match fs::remove_file(target) {
Ok(_) => {
log::debug!("CLI uninstalled successfully without admin privileges");
log::debug!("{command_name} uninstalled successfully without admin privileges");
}
Err(_) => {
log::debug!("File removal failed, trying with admin privileges");
remove_file_with_admin(&cli_path)
log::debug!("{command_name} file removal failed, trying with admin privileges");
remove_file_with_admin(target)
.context("Failed to remove symlink even with admin privileges")?;
log::debug!("CLI uninstalled successfully with admin privileges");
log::debug!("{command_name} uninstalled successfully with admin privileges");
}
}
Ok(())
}
/// Install the Oz CLI by symlinking the shared Warp executable into /usr/local/bin.
///
/// The normal argument parser dispatches Oz subcommands directly. It also uses
/// the `oz`-prefixed invocation name to print CLI help rather than launch the
/// GUI when no subcommand is provided.
pub fn install_oz() -> Result<()> {
let oz_path = oz_install_target_path();
let current_binary =
std::env::current_exe().context("Failed to get current executable path")?;
install_symlink(&current_binary, &oz_path, "Oz CLI")
}
/// Uninstall the Oz CLI by removing the symlink from /usr/local/bin
pub fn uninstall_oz() -> Result<()> {
uninstall_symlink(&oz_install_target_path(), "Oz command")
}
/// Install Warp Control by symlinking its bundled wrapper into /usr/local/bin.
///
/// The wrapper contains no control implementation. It resolves this installed
/// symlink back into the app bundle, launches the shared Warp executable, and
/// injects `--warpctrl` so startup selects the separate Warp Control parser
/// before normal parsing or GUI startup.
pub fn install_warpctrl() -> Result<()> {
let warpctrl_path = warpctrl_install_target_path();
let warpctrl_source = warpctrl_bundle_source_path()?;
if !warpctrl_source.exists() {
return Err(anyhow!(
"Cannot install Warp Control CLI: bundled wrapper not found at {}",
warpctrl_source.display()
));
}
install_symlink(&warpctrl_source, &warpctrl_path, "Warp Control CLI")
}
/// Uninstall the Warp Control CLI by removing the symlink from /usr/local/bin
pub fn uninstall_warpctrl() -> Result<()> {
uninstall_symlink(&warpctrl_install_target_path(), "Warp Control command")
}
#[cfg(test)]
#[path = "cli_install_tests.rs"]
mod tests;