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

This commit is contained in:
Dylan Araps 2019-12-28 22:53:20 +00:00
commit f8305a148f
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
2 changed files with 43 additions and 16 deletions

View File

@ -750,10 +750,11 @@ image_source="auto"
# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata,
# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor,
# SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, # SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus,
# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, # Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap,
# openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
# Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, # Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu,
# Windows7, Xubuntu, Zorin, and IRIX have ascii logos # Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX
# have ascii logos
# NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants.
# Use '{distro name}_old' to use the old logos. # Use '{distro name}_old' to use the old logos.
# NOTE: Ubuntu has flavor variants. # NOTE: Ubuntu has flavor variants.
@ -2671,9 +2672,12 @@ get_song() {
"exaile"*) "exaile"*)
# NOTE: Exaile >= 4.0.0 will support mpris2. # NOTE: Exaile >= 4.0.0 will support mpris2.
song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \ song="$(dbus-send --print-reply --dest=org.exaile.Exaile \
org.exaile.Exaile.Query | /org/exaile/Exaile org.exaile.Exaile.Query |
awk -F':|,' '{if ($6 && $8 && $4) printf $6 "\n" $8 "\n" $4}')" awk -F ':' '{sub(",[^,]*$", "", $3); t=$3;
sub(",[^,]*$", "", $4); a=$4;
sub(",[^,]*$", "", $5); b=$5}
END {print a "\n" b "\n" t}')"
;; ;;
"muine"*) "muine"*)
@ -3779,7 +3783,6 @@ END
"Plasma"*) "Plasma"*)
image=$XDG_CONFIG_HOME/plasma-org.kde.plasma.desktop-appletsrc image=$XDG_CONFIG_HOME/plasma-org.kde.plasma.desktop-appletsrc
image=$(awk -F '=' '$1 == "Image" { print $2 }' "$image") image=$(awk -F '=' '$1 == "Image" { print $2 }' "$image")
image=${image##file://}
;; ;;
*) *)
@ -4712,10 +4715,11 @@ ASCII:
Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata,
Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor,
SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus,
Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap,
openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu,
Windows7, Xubuntu, Zorin, and IRIX have ascii logos Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX
have ascii logos
NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants.
@ -9187,6 +9191,28 @@ ${c1} `- `
EOF 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"*) "openSUSE Tumbleweed"* | "openSUSE_Tumbleweed"*)
set_colors 2 7 set_colors 2 7
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'

View File

@ -302,10 +302,11 @@ PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian,
Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata,
Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor,
SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus,
Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap,
openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, Void, Obarun, windows10, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu,
Windows7, Xubuntu, Zorin, and IRIX have ascii logos Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX
have ascii logos
.IP .IP
NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants.
.IP .IP