1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-24 14:50:07 +00:00

fix: declare variables as global when using typeset

Fixes fb86ec77
This commit is contained in:
Marc Cornellà 2021-12-16 10:15:55 +01:00
parent fb86ec7749
commit 7d03ea18ed
No known key found for this signature in database
GPG key ID: 0314585E776A9C1B
4 changed files with 8 additions and 8 deletions

View file

@ -19,14 +19,14 @@ export DIRHISTORY_SIZE=30
# Returns the element if the array was not empty, # Returns the element if the array was not empty,
# otherwise returns empty string. # otherwise returns empty string.
function pop_past() { function pop_past() {
typeset $1="${dirhistory_past[$#dirhistory_past]}" typeset -g $1="${dirhistory_past[$#dirhistory_past]}"
if [[ $#dirhistory_past -gt 0 ]]; then if [[ $#dirhistory_past -gt 0 ]]; then
dirhistory_past[$#dirhistory_past]=() dirhistory_past[$#dirhistory_past]=()
fi fi
} }
function pop_future() { function pop_future() {
typeset $1="${dirhistory_future[$#dirhistory_future]}" typeset -g $1="${dirhistory_future[$#dirhistory_future]}"
if [[ $#dirhistory_future -gt 0 ]]; then if [[ $#dirhistory_future -gt 0 ]]; then
dirhistory_future[$#dirhistory_future]=() dirhistory_future[$#dirhistory_future]=()
fi fi

View file

@ -32,8 +32,8 @@
########## COLOR ########### ########## COLOR ###########
for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do
typeset PR_$COLOR="%b%{$fg[${(L)COLOR}]%}" typeset -g PR_$COLOR="%b%{$fg[${(L)COLOR}]%}"
typeset PR_BRIGHT_$COLOR="%B%{$fg[${(L)COLOR}]%}" typeset -g PR_BRIGHT_$COLOR="%B%{$fg[${(L)COLOR}]%}"
done done
PR_RESET="%{$reset_color%}" PR_RESET="%{$reset_color%}"

View file

@ -37,8 +37,8 @@ setopt prompt_subst
# See if we can use colors. # See if we can use colors.
autoload zsh/terminfo autoload zsh/terminfo
for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
typeset PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}" typeset -g PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
typeset PR_LIGHT_$color="%{$fg[${(L)color}]%}" typeset -g PR_LIGHT_$color="%{$fg[${(L)color}]%}"
done done
PR_NO_COLOUR="%{$terminfo[sgr0]%}" PR_NO_COLOUR="%{$terminfo[sgr0]%}"

View file

@ -45,8 +45,8 @@ setopt prompt_subst
# See if we can use colors. # See if we can use colors.
autoload zsh/terminfo autoload zsh/terminfo
for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
typeset PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}" typeset -g PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
typeset PR_LIGHT_$color="%{$fg[${(L)color}]%}" typeset -g PR_LIGHT_$color="%{$fg[${(L)color}]%}"
done done
PR_NO_COLOUR="%{$terminfo[sgr0]%}" PR_NO_COLOUR="%{$terminfo[sgr0]%}"