Merge branch 'master' into next
This commit is contained in:
commit
92264124a9
2 changed files with 48 additions and 2 deletions
|
@ -841,9 +841,11 @@ prompt_docker_machine() {
|
|||
# GO prompt
|
||||
prompt_go_version() {
|
||||
local go_version
|
||||
local go_path
|
||||
go_version=$(go version 2>/dev/null | sed -E "s/.*(go[0-9.]*).*/\1/")
|
||||
go_path=$(go env GOPATH 2>/dev/null)
|
||||
|
||||
if [[ -n "$go_version" ]]; then
|
||||
if [[ -n "$go_version" && "${PWD##$go_path}" != "$PWD" ]]; then
|
||||
"$1_prompt_segment" "$0" "$2" "green" "255" "$go_version"
|
||||
fi
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue