diff options
author | Kristján Oddsson <koddsson@gmail.com> | 2015-02-22 19:15:33 +0000 |
---|---|---|
committer | Kristján Oddsson <koddsson@gmail.com> | 2015-02-23 17:25:55 +0000 |
commit | 1308515d1c2014a52aca3ac952a0172d9961eee0 (patch) | |
tree | c70599586f4804b7f16c78d1c9be42ca56e09750 /plugins/bgnotify | |
parent | 31e29e1efbd81df46d9e6ef03a4e4d3bfaf78007 (diff) | |
download | zsh-1308515d1c2014a52aca3ac952a0172d9961eee0.tar.gz zsh-1308515d1c2014a52aca3ac952a0172d9961eee0.tar.bz2 zsh-1308515d1c2014a52aca3ac952a0172d9961eee0.zip |
Re-order OS detection if..else statement.
This patch will re-order the if statements when checking what operating
system the user is running.
This is useful for people that already have a `notify-send` binary in
their $PATH but are running OSX. An example of such requirements is
anyone running `vagrant-notify` is required to have a `notify-send`
binary on their $PATH.
See [link](https://github.com/fgrehm/vagrant-notify#os-x).
Diffstat (limited to 'plugins/bgnotify')
-rwxr-xr-x | plugins/bgnotify/bgnotify.plugin.zsh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh index 5ccead3b8..14ca4c817 100755 --- a/plugins/bgnotify/bgnotify.plugin.zsh +++ b/plugins/bgnotify/bgnotify.plugin.zsh @@ -1,6 +1,5 @@ #!/usr/bin/env zsh - ## setup ## [[ -o interactive ]] || return #interactive only! @@ -21,22 +20,22 @@ if ! (type bgnotify_formatted | grep -q 'function'); then fi currentWindowId () { - if hash notify-send 2>/dev/null; then #ubuntu! - xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }' - elif hash osascript 2>/dev/null; then #osx + if hash osascript 2>/dev/null; then #osx osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null || echo "0" + elif hash notify-send 2>/dev/null; then #ubuntu! + xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }' else echo $EPOCHSECONDS #fallback for windows fi } bgnotify () { - if hash notify-send 2>/dev/null; then #ubuntu! - notify-send $1 $2 - elif hash terminal-notifier 2>/dev/null; then #osx + if hash terminal-notifier 2>/dev/null; then #osx terminal-notifier -message "$2" -title "$1" elif hash growlnotify 2>/dev/null; then #osx growl growlnotify -m $1 $2 + elif hash notify-send 2>/dev/null; then #ubuntu! + notify-send $1 $2 elif hash notifu 2>/dev/null; then #cygwyn support! notifu /m "$2" /p "$1" fi |