Skip to content

fix(shell): support activation on older macOS - #2866

Merged
wolfv merged 1 commit into
conda:mainfrom
Hofer-Julian:fix-shell-support-activation-on-older-macos
Oct 12, 2026
Merged

wolfv merged 1 commit into
conda:mainfrom
Hofer-Julian:fix-shell-support-activation-on-older-macos

Conversation

@Hofer-Julian

Copy link
Copy Markdown
Collaborator

Description

Fall back to plain /usr/bin/env when /usr/bin/env -0 is unavailable on macOS 12.2 and older. Parse both NUL-separated and newline-separated output so activation keeps working on those systems.

The fallback retains the old limitation for environment values containing newlines. Newer macOS versions continue to use NUL-separated output and preserve those values.

Thanks for reporting this, @uwu-420.

How Has This Been Tested?

Added tests

AI Disclosure

  • This PR contains AI-generated content.
    • I have tested any AI-generated content in my PR.
    • I take responsibility for any AI-generated content in my PR.

Tools: GPT Sol

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added sufficient tests to cover my changes.

@Hofer-Julian
Hofer-Julian marked this pull request as ready for review September 28, 2026 15:52

@baszalmstra baszalmstra left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please remove the file and then feel free to merge if you are happy!

Comment thread crates/rattler_shell/CHANGELOG.md Resolved
@Hofer-Julian
Hofer-Julian force-pushed the fix-shell-support-activation-on-older-macos branch from c5e8736 to 6da5ccb Compare October 1, 2026 14:17
@Hofer-Julian
Hofer-Julian enabled auto-merge (squash) October 1, 2026 14:18
@wolfv
wolfv disabled auto-merge October 12, 2026 11:55
@wolfv
wolfv merged commit 49c860a into conda:main Oct 12, 2026
29 of 31 checks passed
This was referenced Oct 12, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants