artemist/lix-installer
0
0
Fork 0
forked from lix-project/lix-installer
Code Pull requests Activity

Repair is_ci handling, sudo was erasing the variables (#274)

Browse source
This commit is contained in:
Ana Hobden 2023-02-24 14:09:26 -08:00 committed by GitHub
parent db329ea65f
commit 3fc5857db2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/cli/mod.rs
View file

@ -98,7 +98,7 @@ pub fn ensure_root() -> eyre::Result<()> {
let mut arg_vec_cstring = vec![]; let mut arg_vec_cstring = vec![];
arg_vec_cstring.push(sudo_cstring.clone()); arg_vec_cstring.push(sudo_cstring.clone());
let mut preserve_env_list = vec![]; let mut env_list = vec![];
for (key, value) in std::env::vars() { for (key, value) in std::env::vars() {
let preserve = match key.as_str() { let preserve = match key.as_str() {
// Rust logging/backtrace bits we use // Rust logging/backtrace bits we use
@ -112,14 +112,21 @@ pub fn ensure_root() -> eyre::Result<()> {
_ => false, _ => false,
}; };
if preserve { if preserve {
preserve_env_list.push(format!("{key}={value}")); env_list.push(format!("{key}={value}"));
} }
} }
if !preserve_env_list.is_empty() { #[cfg(feature = "diagnostics")]
if is_ci::cached() {
// Normally `sudo` would erase those envs, so we detect and pass that along specifically to avoid having to pass around
// a bunch of environment variables
env_list.push(format!("NIX_INSTALLER_CI=1"));
}
if !env_list.is_empty() {
arg_vec_cstring arg_vec_cstring
.push(CString::new("env").wrap_err("Building a `env` argument for `sudo`")?); .push(CString::new("env").wrap_err("Building a `env` argument for `sudo`")?);
for env in preserve_env_list { for env in env_list {
arg_vec_cstring.push( arg_vec_cstring.push(
CString::new(env.clone()) CString::new(env.clone())
.wrap_err_with(|| format!("Building a `{}` argument for `sudo`", env))?, .wrap_err_with(|| format!("Building a `{}` argument for `sudo`", env))?,

3
src/diagnostics.rs
View file

@ -62,7 +62,8 @@ impl DiagnosticData {
Ok(os_release) => (os_release.name, os_release.version), Ok(os_release) => (os_release.name, os_release.version),
Err(_) => ("unknown".into(), "unknown".into()), Err(_) => ("unknown".into(), "unknown".into()),
}; };
let is_ci = is_ci::cached(); let is_ci = is_ci::cached()
|| std::env::var("NIX_INSTALLER_CI").unwrap_or_else(|_| "0".into()) == "1";
Self { Self {
endpoint, endpoint,
version: env!("CARGO_PKG_VERSION").into(), version: env!("CARGO_PKG_VERSION").into(),