luisgulo/neofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:dylanaraps/neofetch

Browse source
This commit is contained in:
Dylan Araps 2016-12-23 10:39:31 +11:00
commit 3e1bc7092a
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -4,6 +4,7 @@
- **[@iandrewt](https://github.com/iandrewt)** - **[@iandrewt](https://github.com/iandrewt)**
- **[@jorgegonzalez](https://github.com/jorgegonzalez)** - **[@jorgegonzalez](https://github.com/jorgegonzalez)**
- **[@z33ky](https://github.com/z33ky)** - **[@z33ky](https://github.com/z33ky)**
- **[@mstraube](https://github.com/mstraube)**
## IRC ## IRC
@ -45,7 +46,7 @@ Neofetch now has an irc channel at `#neofetch` on Freenode. If you have any ques
## Info ## Info
**Shell**<br \> **Shell**<br \>
mstraube
- [Fish] Fixed memory leak caused by Fish. - [Fish] Fixed memory leak caused by Fish.
- Added support for `xonsh`. - Added support for `xonsh`.
- Fixed version output on `ksh`. - Fixed version output on `ksh`.
@ -114,6 +115,7 @@ Neofetch now has an irc channel at `#neofetch` on Freenode. If you have any ques
- Removed `state` detection. - Removed `state` detection.
- Removed duplicate `dbus-send` commands. - Removed duplicate `dbus-send` commands.
- Added support for xmms2. **[@z33ky](https://github.com/z33ky)** - Added support for xmms2. **[@z33ky](https://github.com/z33ky)**
- Add support for Exaile music player. **[@mstraube](https://github.com/mstraube)**
**Battery**<br \> **Battery**<br \>

8
neofetch
View file

@ -1187,7 +1187,7 @@ get_memory() {
get_song() { get_song() {
# This is absurdly long. # This is absurdly long.
player="$(ps x | awk '!(/awk|Helper|Cache/) && /mpd|cmus|mocp|spotify|Google Play|iTunes.app|rhythmbox|banshee|amarok|deadbeef|audacious|xmms2d|gnome-music|lollypop|clementine|pragha/ {printf $5 " " $6; exit}')" player="$(ps x | awk '!(/awk|Helper|Cache/) && /mpd|cmus|mocp|spotify|Google Play|iTunes.app|rhythmbox|banshee|amarok|deadbeef|audacious|xmms2d|gnome-music|lollypop|clementine|pragha|exaile/ {printf $5 " " $6; exit}')"
get_song_dbus() { get_song_dbus() {
# Multiple players use an almost identical dbus command to get the information. # Multiple players use an almost identical dbus command to get the information.
@ -1250,6 +1250,12 @@ get_song() {
title="$(pragha -c | awk -F':' '/title/ {print $2}')" title="$(pragha -c | awk -F':' '/title/ {print $2}')"
song="$artist - $title" song="$artist - $title"
;; ;;
"exaile"*)
song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \
org.exaile.Exaile.Query | awk -F':|,' '{printf $6 " -" $4}')"
song="${song:3}"
;;
esac esac
# Display Artist and Title on separate lines. # Display Artist and Title on separate lines.