This repository has been archived by the owner on Apr 24, 2020. It is now read-only.
Fixed prompt_rust_version to avoid grep aliases #826
Merged
Conversation
This file contains 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
dritter
suggested changes
May 8, 2018
powerlevel9k.zsh-theme
Outdated
| @@ -1104,10 +1104,14 @@ prompt_root_indicator() { | |||
| # Print Rust version number | |||
| prompt_rust_version() { | |||
| local rust_version | |||
| rust_version=$(rustc --version 2>&1 | grep -oe "^rustc\s*[^ ]*" | grep -o '[0-9.a-z\\\-]*$') | |||
| rust_version=$(command rustc --version 2>&1) | |||
There was a problem hiding this comment.
This raises an error, if rustc is not installed. We should silence all errors here:
rust_version=$(command rustc --version 2>/dev/null)
|
|
||
| if [[ -n "$rust_version" ]]; then | ||
| "$1_prompt_segment" "$0" "$2" "208" "$DEFAULT_COLOR" "Rust $rust_version" 'RUST_ICON' | ||
| "$1_prompt_segment" "$0" "$2" "208" "$DEFAULT_COLOR" "$rust_version" 'RUST_ICON' |
|
Thanks for the review; I silenced the missing rustc error and tried to fix the test. Any idea what's going on with the last broken test? |
|
Hah. 🤦♂️ In our test we mock |
Fix test for rust segment
dritter
approved these changes
May 12, 2018
|
Just for the record: This PR is related to #632 |
dritter
added a commit
to dritter/powerlevel9k
that referenced
this pull request
Jun 6, 2018
Conflicts were: - test/segments/rust_version.spec and powerlevel9k.zsh-theme. Powerlevel9k#826 removes grep from parsing the rust version on next; Powerlevel9k#703 changes color names.
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #803