Commit 1308515d authored by Kristján Oddsson's avatar Kristján Oddsson
Browse files

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).
parent 31e29e1e
#!/usr/bin/env zsh #!/usr/bin/env zsh
## setup ## ## setup ##
[[ -o interactive ]] || return #interactive only! [[ -o interactive ]] || return #interactive only!
...@@ -21,22 +20,22 @@ if ! (type bgnotify_formatted | grep -q 'function'); then ...@@ -21,22 +20,22 @@ if ! (type bgnotify_formatted | grep -q 'function'); then
fi fi
currentWindowId () { currentWindowId () {
if hash notify-send 2>/dev/null; then #ubuntu! if hash osascript 2>/dev/null; then #osx
xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }'
elif 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" 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 else
echo $EPOCHSECONDS #fallback for windows echo $EPOCHSECONDS #fallback for windows
fi fi
} }
bgnotify () { bgnotify () {
if hash notify-send 2>/dev/null; then #ubuntu! if hash terminal-notifier 2>/dev/null; then #osx
notify-send $1 $2
elif hash terminal-notifier 2>/dev/null; then #osx
terminal-notifier -message "$2" -title "$1" terminal-notifier -message "$2" -title "$1"
elif hash growlnotify 2>/dev/null; then #osx growl elif hash growlnotify 2>/dev/null; then #osx growl
growlnotify -m $1 $2 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! elif hash notifu 2>/dev/null; then #cygwyn support!
notifu /m "$2" /p "$1" notifu /m "$2" /p "$1"
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment