Merge branch 'ohmyzsh:master' into master

This commit is contained in:
AYO_YO 2025-06-13 09:39:59 +08:00 committed by GitHub
commit 4974ffa6a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 1 deletions

View file

@ -2,6 +2,6 @@ certifi==2025.4.26
charset-normalizer==3.4.2
idna==3.10
PyYAML==6.0.2
requests==2.32.3
requests==2.32.4
semver==3.0.4
urllib3==2.4.0

View file

@ -23,6 +23,9 @@ function open_command() {
linux*) [[ "$(uname -r)" != *icrosoft* ]] && open_cmd='nohup xdg-open' || {
open_cmd='cmd.exe /c start ""'
[[ -e "$1" ]] && { 1="$(wslpath -w "${1:a}")" || return 1 }
[[ "$1" = (http|https)://* ]] && {
1="$(echo "$1" | sed -E 's/([&|()<>^])/^\1/g')" || return 1
}
} ;;
msys*) open_cmd='start ""' ;;
*) echo "Platform $OSTYPE not supported"

View file

@ -353,12 +353,19 @@ prompt_aws() {
esac
}
prompt_terraform() {
local terraform_info=$(tf_prompt_info)
[[ -z "$terraform_info" ]] && return
prompt_segment magenta yellow "TF: $terraform_info"
}
## Main prompt
build_prompt() {
RETVAL=$?
prompt_status
prompt_virtualenv
prompt_aws
prompt_terraform
prompt_context
prompt_dir
prompt_git