Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add configurable PIXI_HOME #627

Merged
merged 7 commits into from
Jan 10, 2024
Merged

feat: Add configurable PIXI_HOME #627

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4ddb94f
feat: Add configurable `PIXI_HOME`
chawyehsu Jan 8, 2024
0bf498b
fix fmt
chawyehsu Jan 8, 2024
6bb8588
Merge remote-tracking branch 'upstream/main' into feature/configurabl…
chawyehsu Jan 9, 2024
6ee98ab
fix conflict
chawyehsu Jan 9, 2024
d81db61
docs(cli): reflect new feature
chawyehsu Jan 9, 2024
c496416
feat(install-script): reflect new configurable feature
chawyehsu Jan 9, 2024
fd0a8ae
Merge branch 'main' into feature/configurable-pixi-home
ruben-arts Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions src/cli/global/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ use std::{
str::FromStr,
};

const BIN_DIR: &str = ".pixi/bin";
const BIN_ENVS_DIR: &str = ".pixi/envs";

/// Installs the defined package in a global accessible location.
#[derive(Parser, Debug)]
#[clap(arg_required_else_help = true)]
Expand Down Expand Up @@ -70,11 +67,20 @@ impl BinDir {
}
}

/// Binaries are installed in ~/.pixi/bin
/// Get pixi home directory, default to `$HOME/.pixi`
fn home_path() -> miette::Result<PathBuf> {
if let Some(path) = std::env::var_os("PIXI_HOME") {
Ok(PathBuf::from(path))
} else {
home_dir()
.map(|path| path.join(".pixi"))
.ok_or_else(|| miette::miette!("could not find home directory"))
}
}

/// Global binaries directory, default to `$HOME/.pixi/bin`
fn bin_dir() -> miette::Result<PathBuf> {
Ok(home_dir()
.ok_or_else(|| miette::miette!("could not find home directory"))?
.join(BIN_DIR))
home_path().map(|path| path.join("bin"))
}

pub(crate) struct BinEnvDir(pub PathBuf);
Expand Down Expand Up @@ -111,11 +117,9 @@ impl BinEnvDir {
}
}

/// Binary environments are installed in ~/.pixi/envs
/// GLobal binary environments directory, default to `$HOME/.pixi/envs`
pub(crate) fn bin_env_dir() -> miette::Result<PathBuf> {
Ok(home_dir()
.ok_or_else(|| miette::miette!("could not find home directory"))?
.join(BIN_ENVS_DIR))
home_path().map(|path| path.join("envs"))
}

/// Find the designated package in the prefix
Expand Down Expand Up @@ -467,11 +471,10 @@ pub async fn execute(args: Args) -> miette::Result<()> {
"{whitespace}These apps are now globally available:\n{whitespace} - {script_names}",
)
} else {
let bin_dir = format!("~/{BIN_DIR}");
eprintln!("{whitespace}These apps have been added to {}\n{whitespace} - {script_names}\n\n{} To use them, make sure to add {} to your PATH",
console::style(&bin_dir).bold(),
console::style(&bin_dir.display()).bold(),
console::style("!").yellow().bold(),
console::style(&bin_dir).bold()
console::style(&bin_dir.display()).bold()
)
}
}
Expand Down
Loading