Skip to content

fix: use $PATH prepend behavior in menuinst activation #1376

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

Merged
baszalmstra merged 2 commits into from
Jun 2, 2025
Merged

fix: use $PATH prepend behavior in menuinst activation #1376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60255e6
make `prepend` the default activation path behavior
wolfv Jun 2, 2025
13c90ad
use prepend
wolfv Jun 2, 2025
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
8 changes: 6 additions & 2 deletions crates/rattler_menuinst/src/linux.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use tempfile::TempDir;
mod mime_config;

use rattler_conda_types::Platform;
use rattler_shell::activation::{ActivationVariables, Activator};
use rattler_shell::activation::{ActivationVariables, Activator, PathModificationBehavior};
use rattler_shell::shell;

use crate::render::{BaseMenuItemPlaceholders, MenuItemPlaceholders, PlaceholderString};
Expand Down Expand Up @@ -300,7 +300,11 @@ impl LinuxMenu {
if self.command.activate.unwrap_or(false) {
// create a bash activation script and emit it into the script
let activator = Activator::from_path(&self.prefix, shell::Bash, Platform::current())?;
let activation_env = activator.run_activation(ActivationVariables::default(), None)?;
let activation_variables = ActivationVariables {
path_modification_behavior: PathModificationBehavior::Prepend,
..Default::default()
};
let activation_env = activator.run_activation(activation_variables, None)?;

for (k, v) in activation_env {
envs.push(format!(r#"{k}="{v}""#));
Expand Down
8 changes: 6 additions & 2 deletions crates/rattler_menuinst/src/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use fs_err::File;
use plist::Value;
use rattler_conda_types::{menuinst::MacOsTracker, Platform};
use rattler_shell::{
activation::{ActivationError, ActivationVariables, Activator},
activation::{ActivationError, ActivationVariables, Activator, PathModificationBehavior},
shell,
};
use sha2::{Digest as _, Sha256};
Expand Down Expand Up @@ -656,7 +656,11 @@ impl MacOSMenu {
if self.command.activate.unwrap_or(false) {
// create a bash activation script and emit it into the script
let activator = Activator::from_path(&self.prefix, shell::Bash, Platform::current())?;
let activation_env = activator.run_activation(ActivationVariables::default(), None)?;
let activation_variables = ActivationVariables {
path_modification_behavior: PathModificationBehavior::Prepend,
..Default::default()
};
let activation_env = activator.run_activation(activation_variables, None)?;

for (k, v) in activation_env {
lines.push(format!(r#"export {k}="{v}""#));
Expand Down
8 changes: 6 additions & 2 deletions crates/rattler_menuinst/src/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use rattler_conda_types::{
Platform,
};
use rattler_shell::{
activation::{ActivationVariables, Activator},
activation::{ActivationVariables, Activator, PathModificationBehavior},
shell,
};
use registry::{notify_shell_changes, FileExtension, UrlProtocol};
Expand Down Expand Up @@ -162,7 +162,11 @@ impl WindowsMenu {
// create a bash activation script and emit it into the script
let activator =
Activator::from_path(&self.prefix, shell::CmdExe, Platform::current()).unwrap();
let activation_env = activator.run_activation(ActivationVariables::default(), None)?;
let activation_variables = ActivationVariables {
path_modification_behavior: PathModificationBehavior::Prepend,
..Default::default()
};
let activation_env = activator.run_activation(activation_variables, None)?;

for (k, v) in activation_env {
lines.push(format!(r#"set "{k}={v}""#));
Expand Down
Loading