zsh: test ~/.zshenv with -f, not -d - #29
Merged
Merged
Conversation
~/.zshenv is a file, so '-d' was never true and that half of the guard was dead -- the intent was clearly to avoid clobbering a zsh setup the user already has. The function then overwrites ~/.zshenv with a heredoc, so the check matters. In practice the '-d $ZPREZTODIR' half already short-circuited repeat runs; this makes the script also leave a pre-existing ~/.zshenv alone on a machine that has one but no prezto checkout. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
There was a problem hiding this comment.
🟡 Changes recommended
The new -f guard still misses non-regular existing ~/.zshenv cases (e.g., directory/FIFO/broken symlink) that can cause the heredoc write to fail or block under set -e.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Pull request overview
Updates the setup_zsh_with_prezto() bootstrap guard to correctly detect an existing ~/.zshenv file before writing a new one, preventing unintended overwrites when Prezto is not already present.
Changes:
- Replace a dead
-d "$HOME/.zshenv"directory check with a file check (-f) in the Prezto setup guard. - Clarify the intent of the guard with an updated comment.
File summaries
| File | Description |
|---|---|
setup |
Fixes the zsh/Prezto setup guard so ~/.zshenv is detected as a file before the script overwrites it. |
Review details
- Files reviewed: 1/1 changed files
- Comments generated: 1
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| # prezto | ||
| if [[ -d "$HOME/.zshenv" || -d "$ZPREZTODIR" ]]; then | ||
| # prezto; bail out rather than clobber an existing zsh setup | ||
| if [[ -f "$HOME/.zshenv" || -d "$ZPREZTODIR" ]]; then |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
~/.zshenv is a file, so '-d' was never true and that half of the guard
was dead -- the intent was clearly to avoid clobbering a zsh setup the
user already has. The function then overwrites ~/.zshenv with a
heredoc, so the check matters.
In practice the '-d $ZPREZTODIR' half already short-circuited repeat
runs; this makes the script also leave a pre-existing ~/.zshenv alone
on a machine that has one but no prezto checkout.
🤖 Generated with Claude Code