From eb48e77595d7be31dd7fe9dc0a8eb5c5a4a4c75a Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 24 Dec 2019 16:23:17 +0100 Subject: [PATCH 1/3] ascii: Add openSUSE Leap logo --- neofetch | 40 ++++++++++++++++++++++++++++++++-------- neofetch.1 | 9 +++++---- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 606a1b60..f73a1809 100755 --- a/neofetch +++ b/neofetch @@ -750,10 +750,11 @@ image_source="auto" # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, # Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, -# openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, -# Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, -# Windows7, Xubuntu, Zorin, and IRIX have ascii logos +# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +# openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, +# Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, +# Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX +# have ascii logos # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. @@ -4714,10 +4715,11 @@ ASCII: Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, - Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, - openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, - Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, - Windows7, Xubuntu, Zorin, and IRIX have ascii logos + Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, + openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, + Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, + Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX + have ascii logos NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. @@ -9189,6 +9191,28 @@ ${c1} `- ` EOF ;; + "openSUSE Leap"* | "openSUSE_Leap"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c2} `-++:` + ./oooooo/- + `:oooooooooooo:. + -+oooooooooooooooo+-` + ./oooooooooooooooooooooo/- + :oooooooooooooooooooooooooo: + ` `-+oooooooooooooooooooo/- ` + `:oo/- .:ooooooooooooooo+:` `-+oo/. +`/oooooo:. -/oooooooooo/. ./oooooo/. + `:+ooooo+-` `:+oooo+- `:oooooo+:` + .:oooooo/. .::` -+oooooo/. + -/oooooo:. ./oooooo+- + `:+ooooo+-:+oooooo:` + ./oooooooooo/. + -/oooo+:` + `:/. +EOF + ;; + "openSUSE Tumbleweed"* | "openSUSE_Tumbleweed"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index f2a95e0d..0737c78b 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -302,10 +302,11 @@ PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, -openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, -Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, Void, Obarun, windows10, -Windows7, Xubuntu, Zorin, and IRIX have ascii logos +Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, +Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, +Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX +have ascii logos .IP NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. .IP From 684d4e881a8cc2b3f962b50e4b00cc9ae97de7f1 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 25 Dec 2019 17:42:37 +0100 Subject: [PATCH 2/3] Remove redundant trim --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index f73a1809..a7984a58 100755 --- a/neofetch +++ b/neofetch @@ -3782,7 +3782,6 @@ END "Plasma"*) image=$XDG_CONFIG_HOME/plasma-org.kde.plasma.desktop-appletsrc image=$(awk -F '=' '$1 == "Image" { print $2 }' "$image") - image=${image##file://} ;; *) From 408d3ae5eaa1d4fe3b1e2f455379ef00fb4433cd Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 25 Dec 2019 17:43:12 +0100 Subject: [PATCH 3/3] song: Fix Exaile --- neofetch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index a7984a58..1144c33e 100755 --- a/neofetch +++ b/neofetch @@ -2672,9 +2672,12 @@ get_song() { "exaile"*) # NOTE: Exaile >= 4.0.0 will support mpris2. - song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \ - org.exaile.Exaile.Query | - awk -F':|,' '{if ($6 && $8 && $4) printf $6 "\n" $8 "\n" $4}')" + song="$(dbus-send --print-reply --dest=org.exaile.Exaile \ + /org/exaile/Exaile org.exaile.Exaile.Query | + awk -F ':' '{sub(",[^,]*$", "", $3); t=$3; + sub(",[^,]*$", "", $4); a=$4; + sub(",[^,]*$", "", $5); b=$5} + END {print a "\n" b "\n" t}')" ;; "muine"*)