Compare commits

...

3 Commits

Author SHA1 Message Date
Tari d2bcc9ce1b
Merge 3b4c63aea4 into 7ff836131a 2026-03-11 10:05:41 -03:00
Kevin Ji 7ff836131a
fix(gcloud): prevent gcloud CLI from hanging (#2935)
If the `gcloud` command is interactive (e.g. asks to install a component, or needs an update), the current code will hang forever, and is uninterruptible as `INT` is being swallowed.

Fix this with `</dev/null` and `--quiet`.
2026-03-11 09:09:44 +08:00
Tari-dev 3b4c63aea4 Add Zorin icon 2025-02-02 17:13:57 +05:30
3 changed files with 12 additions and 1 deletions

View File

@ -75,6 +75,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON '\uE271'$s #  LINUX_ENDEAVOUROS_ICON '\uE271'$s # 
LINUX_ROCKY_ICON '\uE271'$s #  LINUX_ROCKY_ICON '\uE271'$s # 
LINUX_ALMALINUX_ICON '\uE271'$s #  LINUX_ALMALINUX_ICON '\uE271'$s # 
LINUX_ZORIN_ICON '\uE271'$s # 
LINUX_GUIX_ICON '\uE271'$s #  LINUX_GUIX_ICON '\uE271'$s # 
LINUX_NEON_ICON '\uE271'$s #  LINUX_NEON_ICON '\uE271'$s # 
SUNOS_ICON '\U1F31E'$q # 🌞 SUNOS_ICON '\U1F31E'$q # 🌞
@ -234,6 +235,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON '\uF17C'$s #  LINUX_ENDEAVOUROS_ICON '\uF17C'$s # 
LINUX_ROCKY_ICON '\uF17C'$s #  LINUX_ROCKY_ICON '\uF17C'$s # 
LINUX_ALMALINUX_ICON '\uF17C'$s #  LINUX_ALMALINUX_ICON '\uF17C'$s # 
LINUX_ZORIN_ICON '\uF17C'$s # 
LINUX_GUIX_ICON '\uF17C'$s #  LINUX_GUIX_ICON '\uF17C'$s # 
LINUX_NEON_ICON '\uF17C'$s #  LINUX_NEON_ICON '\uF17C'$s # 
SUNOS_ICON '\uF185 ' #  SUNOS_ICON '\uF185 ' # 
@ -394,6 +396,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}" LINUX_ENDEAVOUROS_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
LINUX_ROCKY_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}" LINUX_ROCKY_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
LINUX_ALMALINUX_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}" LINUX_ALMALINUX_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
LINUX_ZORIN_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
LINUX_GUIX_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}" LINUX_GUIX_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
LINUX_NEON_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}" LINUX_NEON_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
SUNOS_ICON "${CODEPOINT_OF_AWESOME_SUN_O:+\\u$CODEPOINT_OF_AWESOME_SUN_O }" SUNOS_ICON "${CODEPOINT_OF_AWESOME_SUN_O:+\\u$CODEPOINT_OF_AWESOME_SUN_O }"
@ -547,6 +550,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON '\UF322'$s #  LINUX_ENDEAVOUROS_ICON '\UF322'$s # 
LINUX_ROCKY_ICON '\UF32B'$s #  LINUX_ROCKY_ICON '\UF32B'$s # 
LINUX_ALMALINUX_ICON '\UF31D'$s #  LINUX_ALMALINUX_ICON '\UF31D'$s # 
LINUX_ZORIN_OS '\uF32F'$s # 
LINUX_GUIX_ICON '\UF325'$s #  LINUX_GUIX_ICON '\UF325'$s # 
LINUX_NEON_ICON '\uF17C' #  LINUX_NEON_ICON '\uF17C' # 
LINUX_ICON '\uF17C' #  LINUX_ICON '\uF17C' # 
@ -708,6 +712,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON '\uF17C' #  LINUX_ENDEAVOUROS_ICON '\uF17C' # 
LINUX_ROCKY_ICON '\uF17C' #  LINUX_ROCKY_ICON '\uF17C' # 
LINUX_ALMALINUX_ICON '\uF17C' #  LINUX_ALMALINUX_ICON '\uF17C' # 
LINUX_ZORIN_ICON '\uF17C' # 
LINUX_GUIX_ICON '\uF325'$s #  LINUX_GUIX_ICON '\uF325'$s # 
LINUX_NEON_ICON '\uF17C' #  LINUX_NEON_ICON '\uF17C' # 
LINUX_ICON '\uF17C' #  LINUX_ICON '\uF17C' # 
@ -862,6 +867,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON 'edvos' LINUX_ENDEAVOUROS_ICON 'edvos'
LINUX_ROCKY_ICON 'rocky' LINUX_ROCKY_ICON 'rocky'
LINUX_ALMALINUX_ICON 'alma' LINUX_ALMALINUX_ICON 'alma'
LINUX_ZORIN_ICON 'zorin'
LINUX_GUIX_ICON 'guix' LINUX_GUIX_ICON 'guix'
LINUX_NEON_ICON 'neon' LINUX_NEON_ICON 'neon'
SUNOS_ICON 'sunos' SUNOS_ICON 'sunos'
@ -1017,6 +1023,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON 'Edv' LINUX_ENDEAVOUROS_ICON 'Edv'
LINUX_ROCKY_ICON 'Roc' LINUX_ROCKY_ICON 'Roc'
LINUX_ALMALINUX_ICON 'Alma' LINUX_ALMALINUX_ICON 'Alma'
LINUX_ZORIN_ICON 'Zorin'
LINUX_GUIX_ICON 'Guix' LINUX_GUIX_ICON 'Guix'
LINUX_NEON_ICON 'Neon' LINUX_NEON_ICON 'Neon'
SUNOS_ICON 'Sun' SUNOS_ICON 'Sun'

View File

@ -4716,7 +4716,9 @@ _p9k_gcloud_prefetch() {
if ! _p9k_cache_stat_get $0 ${CLOUDSDK_CONFIG:-~/.config/gcloud}/configurations/config_$P9K_GCLOUD_CONFIGURATION; then if ! _p9k_cache_stat_get $0 ${CLOUDSDK_CONFIG:-~/.config/gcloud}/configurations/config_$P9K_GCLOUD_CONFIGURATION; then
local pair account project_id local pair account project_id
pair="$(gcloud config configurations describe $P9K_GCLOUD_CONFIGURATION \ pair="$(gcloud config configurations describe $P9K_GCLOUD_CONFIGURATION \
--format=$'value[separator="\1"](properties.core.account,properties.core.project)')" --quiet \
--format=$'value[separator="\1"](properties.core.account,properties.core.project)' \
</dev/null)"
(( ! $? )) && IFS=$'\1' read account project_id <<<$pair (( ! $? )) && IFS=$'\1' read account project_id <<<$pair
_p9k_cache_stat_set "$account" "$project_id" _p9k_cache_stat_set "$account" "$project_id"
fi fi
@ -8677,6 +8679,7 @@ function _p9k_init_cacheable() {
endeavouros) _p9k_set_os Linux LINUX_ENDEAVOUROS_ICON;; endeavouros) _p9k_set_os Linux LINUX_ENDEAVOUROS_ICON;;
rocky) _p9k_set_os Linux LINUX_ROCKY_ICON;; rocky) _p9k_set_os Linux LINUX_ROCKY_ICON;;
almalinux) _p9k_set_os Linux LINUX_ALMALINUX_ICON;; almalinux) _p9k_set_os Linux LINUX_ALMALINUX_ICON;;
zorin) _p9k_set_os Linux LINUX_ZORIN_ICON;;
guix) _p9k_set_os Linux LINUX_GUIX_ICON;; guix) _p9k_set_os Linux LINUX_GUIX_ICON;;
neon) _p9k_set_os Linux LINUX_NEON_ICON;; neon) _p9k_set_os Linux LINUX_NEON_ICON;;
*) _p9k_set_os Linux LINUX_ICON;; *) _p9k_set_os Linux LINUX_ICON;;

View File

@ -1165,6 +1165,7 @@ function os_icon_name() {
endeavouros) echo LINUX_ENDEAVOUROS_ICON;; endeavouros) echo LINUX_ENDEAVOUROS_ICON;;
rocky) echo LINUX_ROCKY_ICON;; rocky) echo LINUX_ROCKY_ICON;;
almalinux) echo LINUX_ALMALINUX_ICON;; almalinux) echo LINUX_ALMALINUX_ICON;;
ZORIN) echo LINUX_ZORIN_ICON;;
guix) echo LINUX_GUIX_ICON;; guix) echo LINUX_GUIX_ICON;;
neon) echo LINUX_NEON_ICON;; neon) echo LINUX_NEON_ICON;;
*) echo LINUX_ICON;; *) echo LINUX_ICON;;