linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3622 from koddsson/notifier-plugin-if-order

Browse source 
Re-order OS detection if..else statement in bgnotify plugin.
This commit is contained in:
Robby Russell 2015-02-23 15:14:00 -08:00
commit 6ddd44a341
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/bgnotify/bgnotify.plugin.zsh
View file

@ -1,6 +1,5 @@
#!/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
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