[pull] master from Bash-it:master #40
Merged
Conversation
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
The logic to guess whether to use `.bash_profile` or `.bashrc` was buggy and wrong. Just use `.bashrc` and either automatically fill in a `.bash_profile`, or notify the user that they need to edit their `.bash_profile`.
docs/installation: add to note about interactive/login shells
- Alsö, add implementation note at top.
uninstall: TIL that `fgrep` is deprecated...
- and generally comment out useless varbls
This adds *two* lines to `bash_it.sh`. Just not worth an extra file requiring special handling.
...and update all the tests...
- it doesn't make sense; I'm guessing it was due to a misunderstanding of host names?
- Don't define some aliases if the target isn't installed, use _command_exists to check instead of `type` and `which`. - Use `$EDITOR` for the editor for aliases about editing, excep the `sudo` ones because maybe you want those specifically? - Fix `ls` aliases to match their common definitions (-A instead of -a: don't show '.' and '..' when displaying hidden files).
This plugin *only* provides utility functions, so it has zero cost to just being enabled. This allows us to eliminate assumptions from `lib/theme` and several themes.
* master: remove superfluous function and pick better var names for readability Update base.theme.bash Update base.theme.bash Update base.theme.bash Update base.theme.bash Fix for 2323 issue Apply fixes Add `.git-blame-ignore-revs` Clean themes A-L Update powerline-multiline.base.bash Fix a couple bugs introduced by last commit Fix bad merge important syntax correction from the owenr of ble.sh only the correct FZF integration loads, sepending on whether the blesh plugin is enabled as well. readonly HIST* variables is a bit extreme and clashes with ble.sh and other tools. Fix node and ruby colors Update themes/base.theme.bash lib/theme: use `_command_exists()` `node_version_prompt` should work without NVM
…ic-plugins * 'gaelic-plugins' of github.com:seefood/bash-it: Update plugins/available/extract.plugin.bash plugin/extract: `shellcheck` plugin/extract: `shfmt` aliases/general: move `xt` to `plugin/extract` aliases/editor: split out editor shortcuts aliases/directory: split out directory shortcuts aliases/general: cleanup
* master: Add aliases for git worktree Tofu completion rewrite have pre-commit ignore the /vendor, they should be immutable. Fix: __powerline_last_status_prompt to handle unset argument safely completion/dirs completion/export completion/vuejs: `shellcheck` completion/notify-send: `shellcheck` completion/dmidecode: `shellcheck` completions: clear and consistent log messages completions: `shellcheck` completions: add to `clean_files.txt` lib/completion: `_bash-it-completion-helper-necessary()` et al lib/completion
- Fix SVN priority test expectation (750 instead of 150) - Add fallback handling for xterm plugin when safe_append functions unavailable - Add guards for battery functions in base theme - Add CLAUDE.md project documentation 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
Resolve conflicts by:
- Keep 750 alias priority (correct default)
- Adopt safer ${var:-} variable expansion from upstream
- Keep color constants instead of hardcoded escape sequences
- Add 'run' commands to tests for better practices
Conflicts resolved in:
- install.sh: Variable expansion and color handling
- test/lib/helpers.bats: Priority values and test commands
The template now uses "${BASH_IT?}/bash_it.sh" instead of "$BASH_IT"/bash_it.sh
but the test was checking for the old format, causing CI failures.
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <noreply@anthropic.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )