diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2023-03-18 16:23:39 -0700 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2023-03-18 16:23:39 -0700 |
| commit | 4b0bbc0b263a150eb9a9b59f196914629be06a9b (patch) | |
| tree | 619723cfa449f93149b766ee397f85ce2acef5f7 /plugins/gnu-utils/gnu-utils.plugin.zsh | |
| parent | db7efd2336e4dbe6abf321b00dbc11bc5afb1355 (diff) | |
| parent | 72732a224e886933df6b64a49ec6f5e94c884612 (diff) | |
| download | zsh-4b0bbc0b263a150eb9a9b59f196914629be06a9b.tar.gz zsh-4b0bbc0b263a150eb9a9b59f196914629be06a9b.tar.bz2 zsh-4b0bbc0b263a150eb9a9b59f196914629be06a9b.zip | |
Merge remote-tracking branch 'github/master'
Diffstat (limited to 'plugins/gnu-utils/gnu-utils.plugin.zsh')
| -rw-r--r-- | plugins/gnu-utils/gnu-utils.plugin.zsh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh index 9419127d8..6bd3e8463 100644 --- a/plugins/gnu-utils/gnu-utils.plugin.zsh +++ b/plugins/gnu-utils/gnu-utils.plugin.zsh @@ -61,3 +61,14 @@ __gnu_utils_preexec() { autoload -Uz add-zsh-hook add-zsh-hook preexec __gnu_utils_preexec + +# lib/theme-and-appearance.zsh sets the alias for ls not knowing that +# we'll be using GNU ls. We'll reset this to use GNU ls --color. +# See https://github.com/ohmyzsh/ohmyzsh/issues/11503 +# +# The ls alias might look like: +# - ls='ls -G' +# - ls='gls --color=tty' +if [[ -x "${commands[gls]}" && "${aliases[ls]}" = (*-G*|gls*) ]]; then + alias ls='ls --color=tty' +fi |