fix shell, vim, and git startup compatibility#9
Merged
Conversation
Prefer app-bundle executable paths for p4merge and kdiff3 on macOS while keeping command-name fallbacks so merge and diff tools resolve reliably across environments.
Keep command output and prompt glyph on separate lines by adding LP_PS1_PREFIX and LP_MARK_PREFIX for a cleaner terminal prompt flow.
Replace semicolon-based if/then snippets with semicolon-free shell expressions so gitconfig preserves full p4merge and kdiff3 commands instead of truncating at the first semicolon.
Drop the unsupported `set surround` line so Vim starts cleanly without E518 when loading ~/.vimrc.
Drop nvm startup wiring from the bash profile now that node and npm are managed via asdf, avoiding startup-time prefix conflicts.
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
1 participant
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.
Summary
set surround) that caused startup errorE518when loading~/.vimrcnvmbootstrap from Bash profile now that Node/npm are managed throughasdf, preventing startup prefix conflictsTest plan
git mergetooland confirm p4merge launches successfullyE518startup errorasdfwith no nvm prefix warningMade with Cursor