Merge branch 'master' of https://github.com/dylanaraps/neofetch
This commit is contained in:
commit
8c6a709a37
15
neofetch
15
neofetch
|
@ -449,6 +449,7 @@ disk_subtitle="mount"
|
||||||
# exaile
|
# exaile
|
||||||
# gnome-music
|
# gnome-music
|
||||||
# gmusicbrowser
|
# gmusicbrowser
|
||||||
|
# gogglesmm
|
||||||
# guayadeque
|
# guayadeque
|
||||||
# iTunes
|
# iTunes
|
||||||
# juk
|
# juk
|
||||||
|
@ -469,6 +470,7 @@ disk_subtitle="mount"
|
||||||
# tomahawk
|
# tomahawk
|
||||||
# vlc
|
# vlc
|
||||||
# xmms2d
|
# xmms2d
|
||||||
|
# xnoise
|
||||||
# yarock
|
# yarock
|
||||||
music_player="auto"
|
music_player="auto"
|
||||||
|
|
||||||
|
@ -2431,6 +2433,7 @@ get_song() {
|
||||||
"exaile"
|
"exaile"
|
||||||
"gnome-music"
|
"gnome-music"
|
||||||
"gmusicbrowser"
|
"gmusicbrowser"
|
||||||
|
"gogglesmm"
|
||||||
"guayadeque"
|
"guayadeque"
|
||||||
"iTunes"
|
"iTunes"
|
||||||
"juk"
|
"juk"
|
||||||
|
@ -2453,6 +2456,7 @@ get_song() {
|
||||||
"tomahawk"
|
"tomahawk"
|
||||||
"vlc"
|
"vlc"
|
||||||
"xmms2d"
|
"xmms2d"
|
||||||
|
"xnoise"
|
||||||
"yarock"
|
"yarock"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -2500,6 +2504,8 @@ get_song() {
|
||||||
"smplayer"*) get_song_dbus "smplayer" ;;
|
"smplayer"*) get_song_dbus "smplayer" ;;
|
||||||
"rhythmbox"*) get_song_dbus "rhythmbox" ;;
|
"rhythmbox"*) get_song_dbus "rhythmbox" ;;
|
||||||
"strawberry"*) get_song_dbus "strawberry" ;;
|
"strawberry"*) get_song_dbus "strawberry" ;;
|
||||||
|
"gogglesmm"*) get_song_dbus "gogglesmm" ;;
|
||||||
|
"xnoise"*) get_song_dbus "xnoise" ;;
|
||||||
"netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;;
|
"netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;;
|
||||||
"plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;;
|
"plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;;
|
||||||
|
|
||||||
|
@ -2732,8 +2738,11 @@ get_style() {
|
||||||
|
|
||||||
# Check for general GTK2 Theme.
|
# Check for general GTK2 Theme.
|
||||||
if [[ -z "$gtk2_theme" ]]; then
|
if [[ -z "$gtk2_theme" ]]; then
|
||||||
if [[ -f "${GTK2_RC_FILES:-${HOME}/.gtkrc-2.0}" ]]; then
|
if [[ -n "$GTK2_RC_FILES" ]]; then
|
||||||
gtk2_theme="$(grep "^[^#]*${name}" "${GTK2_RC_FILES:-${HOME}/.gtkrc-2.0}")"
|
IFS=: read -ra rc_files <<< "$GTK2_RC_FILES"
|
||||||
|
gtk2_theme="$(grep "^[^#]*${name}" "${rc_files[@]}")"
|
||||||
|
elif [[ -f "${HOME}/.gtkrc-2.0" ]]; then
|
||||||
|
gtk2_theme="$(grep "^[^#]*${name}" "${HOME}/.gtkrc-2.0")"
|
||||||
|
|
||||||
elif [[ -f "/etc/gtk-2.0/gtkrc" ]]; then
|
elif [[ -f "/etc/gtk-2.0/gtkrc" ]]; then
|
||||||
gtk2_theme="$(grep "^[^#]*${name}" /etc/gtk-2.0/gtkrc)"
|
gtk2_theme="$(grep "^[^#]*${name}" /etc/gtk-2.0/gtkrc)"
|
||||||
|
@ -2743,7 +2752,7 @@ get_style() {
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
gtk2_theme="${gtk2_theme/${name}*=}"
|
gtk2_theme="${gtk2_theme/*${name}*=}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check for general GTK3 Theme.
|
# Check for general GTK3 Theme.
|
||||||
|
|
Reference in New Issue