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: allow for additional activation scripts #263

Closed
wants to merge 4 commits into from
Closed

feat: allow for additional activation scripts #263

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2921336
feat: allow for additional activation scripts
ruben-arts Jul 13, 2023
5b6b8ff
Merge remote-tracking branch 'origin/main' into feature/additional_ac…
ruben-arts Jul 13, 2023
8dfddfe
fmt
ruben-arts Jul 13, 2023
8fb959f
remove unrelated fix
ruben-arts Jul 13, 2023
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
13 changes: 13 additions & 0 deletions crates/rattler_shell/src/activation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ pub struct ActivationVariables {

/// The type of behaviour of what should happen with the defined paths.
pub path_modification_behaviour: PathModificationBehaviour,

/// Paths to additional activation scripts
pub additional_activation_scripts: Option<Vec<PathBuf>>,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can just be Vec right?

}

impl ActivationVariables {
Expand All @@ -49,6 +52,7 @@ impl ActivationVariables {
conda_prefix: std::env::var("CONDA_PREFIX").ok().map(PathBuf::from),
path: None,
path_modification_behaviour: PathModificationBehaviour::Prepend,
additional_activation_scripts: None,
})
}
}
Expand Down Expand Up @@ -405,6 +409,14 @@ impl<T: Shell + Clone> Activator<T> {
.map_err(ActivationError::FailedToWriteActivationScript)?;
}

if let Some(additional_activation_scripts) = &variables.additional_activation_scripts {
for additional_activation_script in additional_activation_scripts {
self.shell_type
.run_script(&mut script, additional_activation_script)
.map_err(ActivationError::FailedToWriteActivationScript)?;
}
}

Ok(ActivationResult { script, path })
}

Expand Down Expand Up @@ -617,6 +629,7 @@ mod tests {
PathBuf::from("/usr/local/bin"),
]),
path_modification_behaviour,
additional_activation_scripts: None,
})
.unwrap();
let prefix = tdir.path().to_str().unwrap();
Expand Down
Loading