diff options
author | Tuowen Zhao <ztuowen@gmail.com> | 2021-03-31 17:13:28 -0600 |
---|---|---|
committer | Tuowen Zhao <ztuowen@gmail.com> | 2021-03-31 17:13:28 -0600 |
commit | b6baa00fd2d8e44b5abda20f95461942b615258c (patch) | |
tree | bee316446409245d86dba5dc70502486831734d1 /lib | |
parent | 0a67be1024b1e54b6af59f01b01ceace9fdf7bb2 (diff) | |
parent | 2d40b562e5da4c885babc1f7f09aa33a8a891eb2 (diff) | |
download | zsh-b6baa00fd2d8e44b5abda20f95461942b615258c.tar.gz zsh-b6baa00fd2d8e44b5abda20f95461942b615258c.tar.bz2 zsh-b6baa00fd2d8e44b5abda20f95461942b615258c.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'lib')
-rw-r--r-- | lib/completion.zsh | 4 | ||||
-rw-r--r-- | lib/diagnostics.zsh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/completion.zsh b/lib/completion.zsh index 2b62785d5..ebaab0856 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -32,9 +32,9 @@ zstyle ':completion:*' list-colors '' zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01' if [[ "$OSTYPE" = solaris* ]]; then - zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm" + zstyle ':completion:*:*:*:*:processes' command "ps -u $USERNAME -o pid,user,comm" else - zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w" + zstyle ':completion:*:*:*:*:processes' command "ps -u $USERNAME -o pid,user,comm -w -w" fi # disable named-directories autocompletion diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh index 001de42b7..650520797 100644 --- a/lib/diagnostics.zsh +++ b/lib/diagnostics.zsh @@ -112,7 +112,7 @@ function _omz_diag_dump_one_big_text() { command uname -a builtin echo OSTYPE=$OSTYPE builtin echo ZSH_VERSION=$ZSH_VERSION - builtin echo User: $USER + builtin echo User: $USERNAME builtin echo umask: $(umask) builtin echo _omz_diag_dump_os_specific_version |