From 7f5554ac6cd7e711ea787985cc54bbf54b519d06 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 26 Jan 2017 08:19:44 +0100 Subject: [PATCH 1/3] Song: Fix typo --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index cf78c057..a6bcb872 100755 --- a/neofetch +++ b/neofetch @@ -1337,7 +1337,7 @@ get_song() { ;; esac - [[ "$(trim "$song")" = "-" ]] && unset -v song + [[ "$(trim "$song")" == "-" ]] && unset -v song # Display Artist and Title on separate lines. if [[ "$song_shorthand" == "on" ]]; then From e66b63d0f326bd6865ae027397ef0d9139351344 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 26 Jan 2017 09:03:35 +0100 Subject: [PATCH 2/3] Song: Use get_song_dbus for audacious --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a6bcb872..2aab713f 100755 --- a/neofetch +++ b/neofetch @@ -1281,9 +1281,9 @@ get_song() { "google play"*) song="$(gpmdp-remote current)" ;; "rhythmbox"*) song="$(rhythmbox-client --print-playing)" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% - %title%')" ;; - "audacious"*) song="$(audtool current-song)" ;; "xmms2d"*) song="$(xmms2 current -f '${artist} - ${title}')" ;; "qmmp"*) song="$(qmmp --nowplaying '%p - %t')" ;; + "audacious"*) get_song_dbus "audacious" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; From c7892a70c73da8dc4e107795e04aaad5c842ff2b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 26 Jan 2017 09:05:24 +0100 Subject: [PATCH 3/3] Song: Don't print empty song with song_shorthand --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2aab713f..402033ce 100755 --- a/neofetch +++ b/neofetch @@ -1340,7 +1340,7 @@ get_song() { [[ "$(trim "$song")" == "-" ]] && unset -v song # Display Artist and Title on separate lines. - if [[ "$song_shorthand" == "on" ]]; then + if [[ "$song_shorthand" == "on" && "$song" ]]; then artist="${song/ -*}" song="${song/$artist - }"