Skip to content

Commit 8c605c0

Browse files
committed
Revert "Work around some CentOS quirks"
This reverts commit 31d5ad3.
1 parent 31d5ad3 commit 8c605c0

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

agkozak-zsh-prompt.plugin.zsh

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,6 @@ _agkozak_has_usr1() {
379379
# when necessary).
380380
#
381381
# Globals:
382-
# AGKOZAK_IS_WSL
383-
# AGKOZAK_IS_CENTOS
384382
# AGKOZAK_ASYNC_METHOD
385383
# AGKOZAK_FORCE_ASYNC_METHOD
386384
# AGKOZAK_TRAPUSR1_FUNCTION
@@ -392,9 +390,7 @@ _agkozak_async_init() {
392390
if [[ -e /proc/version ]]; then
393391
if [[ -n ${(M)${(f)"$(</proc/version)"}:#*Microsoft*} ]]; then
394392
unsetopt BG_NICE
395-
typeset -g AGKOZAK_IS_WSL=1 # For later reference
396-
elif [[ -n ${(M)${(f)"$(</proc/version)"}:#*centos*} ]]; then
397-
typeset -g AGKOZAK_IS_CENTOS=1
393+
local WSL=1 # For later reference
398394
fi
399395
fi
400396

@@ -406,9 +402,8 @@ _agkozak_async_init() {
406402
# Otherwise, first provide for certain quirky systems
407403
else
408404

409-
if (( AGKOZAK_IS_WSL )) || (( AGKOZAK_IS_CENTOS )) \
410-
|| [[ $OSTYPE == solaris* ]]; then
411-
if [[ $ZSH_VERSION != '5.0.2' ]] && _agkozak_load_async_lib; then
405+
if (( WSL )) || [[ $OSTYPE == solaris* ]]; then
406+
if [[ $ZSH_VERSION != '5.0.2' ]] &&_agkozak_load_async_lib; then
412407
typeset -g AGKOZAK_ASYNC_METHOD='zsh-async'
413408
elif _agkozak_has_usr1; then
414409
typeset -g AGKOZAK_ASYNC_METHOD='usr1'
@@ -444,7 +439,6 @@ _agkozak_async_init() {
444439
#
445440
# Globals:
446441
# AGKOZAK_ASYNC_FD
447-
# AGKOZAK_IS_WSL
448442
############################################################
449443
_agkozak_subst_async() {
450444
setopt LOCAL_OPTIONS NO_IGNORE_BRACES
@@ -454,8 +448,7 @@ _agkozak_async_init() {
454448
if [[ $OSTYPE == (msys|cygwin|solaris*) ]]; then
455449
exec {AGKOZAK_ASYNC_FD}< <(_agkozak_branch_status; command true)
456450
# Prevent WSL from locking up when using X
457-
elif (( AGKOZAK_IS_WSL )) && (( $+DISPLAY )) \
458-
|| (( AGKOZAK_IS_CENTOS )); then
451+
elif (( WSL )) && (( $+DISPLAY )); then
459452
exec {AGKOZAK_ASYNC_FD}< <(_agkozak_branch_status)
460453
command sleep 0.01
461454
else
@@ -862,7 +855,7 @@ _agkozak_prompt_string () {
862855
}
863856

864857
# Clean up environment
865-
# unfunction _agkozak_load_async_lib _agkozak_has_usr1 _agkozak_is_ssh \
866-
# _agkozak_async_init
858+
unfunction _agkozak_load_async_lib _agkozak_has_usr1 _agkozak_is_ssh \
859+
_agkozak_async_init
867860

868861
# vim: ts=2:et:sts=2:sw=2:

0 commit comments

Comments
 (0)