diff options
| author | Hong <hong@topbug.net> | 2016-10-10 13:24:30 -0700 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2016-10-10 22:24:30 +0200 |
| commit | a56eac7a71a774a4d97bb9456f36b8eb495329d5 (patch) | |
| tree | ef3afc060359a3d3aaf9a5ef6257503989905a0b /plugins | |
| parent | 98cd3973d23dfb83aa60f5d11bbb31e2dc714fad (diff) | |
| download | zsh-a56eac7a71a774a4d97bb9456f36b8eb495329d5.tar.gz zsh-a56eac7a71a774a4d97bb9456f36b8eb495329d5.tar.bz2 zsh-a56eac7a71a774a4d97bb9456f36b8eb495329d5.zip | |
Use OSTYPE instead of uname whenever possible for better speed. (#5496)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/battery/battery.plugin.zsh | 2 | ||||
| -rw-r--r-- | plugins/gitfast/git-completion.bash | 2 | ||||
| -rw-r--r-- | plugins/sublime/sublime.plugin.zsh | 2 | ||||
| -rw-r--r-- | plugins/zsh-navigation-tools/_n-kill | 4 | ||||
| -rw-r--r-- | plugins/zsh-navigation-tools/n-kill | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh index 0bb9e77f0..da229cf35 100644 --- a/plugins/battery/battery.plugin.zsh +++ b/plugins/battery/battery.plugin.zsh @@ -64,7 +64,7 @@ if [[ "$OSTYPE" = darwin* ]] ; then [[ $(ioreg -rc "AppleSmartBattery"| grep '^.*"IsCharging"\ =\ ' | sed -e 's/^.*"IsCharging"\ =\ //') == "Yes" ]] } -elif [[ $(uname) == "Linux" ]] ; then +elif [[ "$OSTYPE" = linux* ]] ; then function battery_is_charging() { ! [[ $(acpi 2>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash index e3918c87e..8ce6b5c5f 100644 --- a/plugins/gitfast/git-completion.bash +++ b/plugins/gitfast/git-completion.bash @@ -2771,6 +2771,6 @@ __git_complete gitk __gitk_main # when the user has tab-completed the executable name and consequently # included the '.exe' suffix. # -if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then +if [[ "$OSTYPE" = cygwin* ]]; then __git_complete git.exe __git_main fi diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh index 75a39eab1..f84b7032a 100644 --- a/plugins/sublime/sublime.plugin.zsh +++ b/plugins/sublime/sublime.plugin.zsh @@ -1,4 +1,4 @@ -if [[ $('uname') == 'Linux' ]]; then +if [[ "$OSTYPE" == linux* ]]; then local _sublime_linux_paths > /dev/null 2>&1 _sublime_linux_paths=( "$HOME/bin/sublime_text" diff --git a/plugins/zsh-navigation-tools/_n-kill b/plugins/zsh-navigation-tools/_n-kill index 8a4ec9da7..6f5d47971 100644 --- a/plugins/zsh-navigation-tools/_n-kill +++ b/plugins/zsh-navigation-tools/_n-kill @@ -10,8 +10,8 @@ integer cygwin=0 local IFS=" " -case "$(uname)" in - CYGWIN*) list=( `command ps -Wa` ); cygwin=1 ;; +case "$OSTYPE" in + cygwin*) list=( `command ps -Wa` ); cygwin=1 ;; *) list=( `command ps -o pid,uid,command -A` ) ;; esac diff --git a/plugins/zsh-navigation-tools/n-kill b/plugins/zsh-navigation-tools/n-kill index 0d10565e4..76050f969 100644 --- a/plugins/zsh-navigation-tools/n-kill +++ b/plugins/zsh-navigation-tools/n-kill @@ -42,8 +42,8 @@ NLIST_NONSELECTABLE_ELEMENTS=( 1 ) type ps 2>/dev/null 1>&2 || { echo >&2 "Error: \`ps' not found"; return 1 } -case "$(uname)" in - CYGWIN*) list=( `command ps -Wa` ) ;; +case "$OSTYPE" in + cygwin*) list=( `command ps -Wa` ) ;; *) list=( `command ps -o pid,uid,command -A` ) ;; esac |