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

This commit is contained in:
Dylan Araps 2020-07-25 08:36:15 +03:00
commit 46b2942e17
1 changed files with 72 additions and 10 deletions

View File

@ -776,10 +776,10 @@ image_source="auto"
# LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, # LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva,
# Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib,
# Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner,
# NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, # NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba,
# OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, # OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD,
# Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, # Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint,
# Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, # popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix,
# Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, # Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan,
# Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, # Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific,
# Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, # Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz,
@ -1087,6 +1087,19 @@ get_distro() {
distro=$(trim_quotes "$distro") distro=$(trim_quotes "$distro")
distro=${distro/NAME=} distro=${distro/NAME=}
# Get Ubuntu flavor.
if [[ $distro == "Ubuntu"* ]]; then
case $XDG_CONFIG_DIRS in
*"plasma"*) distro=${distro/Ubuntu/Kubuntu} ;;
*"mate"*) distro=${distro/Ubuntu/Ubuntu MATE} ;;
*"xubuntu"*) distro=${distro/Ubuntu/Xubuntu} ;;
*"Lubuntu"*) distro=${distro/Ubuntu/Lubuntu} ;;
*"budgie"*) distro=${distro/Ubuntu/Ubuntu Budgie} ;;
*"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;;
*"cinnamon"*) distro=${distro/Ubuntu/Ubuntu Cinnamon} ;;
esac
fi
;; ;;
"Mac OS X"|"macOS") "Mac OS X"|"macOS")
@ -4885,9 +4898,9 @@ ASCII:
LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS,
Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib,
Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX,
OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, OpenStage, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva,
OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus,
Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS,
Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar,
Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon,
Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux,
@ -8369,6 +8382,29 @@ ${c1} `-|.' /_. ${c4}\_| ${c1} F
EOF EOF
;; ;;
"openEuler"*)
set_colors 4 7 1
read -rd '' ascii_data <<'EOF'
${c1}
(#####
(((######## #####
((( ########## __...__
(((((((( ####### /((((((###\
((((((((((( ....... \(((((####/
(((((( ((((######### *******
%((((((# ((########
/////((((( ###
/////(((((((# (((&
(((((((((((((
((((((((((((
((((((((( ((((((###
/((((((######
//((((((######
/((((((#####
*********/
EOF
;;
"OpenIndiana"*) "OpenIndiana"*)
set_colors 4 7 1 set_colors 4 7 1
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
@ -9891,7 +9927,33 @@ ${c1} ▀█████████ ███████${c2}███▀
EOF EOF
;; ;;
"Ubuntu-Budgie"*) "Ubuntu Cinnamon"* | "Ubuntu-Cinnamon"*)
set_colors 1
read -rd '' ascii_data <<'EOF'
${c1} .-:/++oooo++/:-.
`:/oooooooooooooooooo/-`
-/oooooooooooooooooooo+ooo/-
.+oooooooooooooooooo+/-`.ooooo+.
:oooooooooooo+//:://++:. .ooooooo:
/oooooooooo+o:`.----.``./+/oooooooo/
/ooooooooo+. +ooooooooo+:``/ooooooooo/
.ooooooooo: .+ooooooooooooo- -ooooooooo.
/oooooo/o+ .ooooooo:`+oo+ooo- :oooooooo/
ooo+:. .o: :ooooo:` .+/. ./o+:/ooooooooo
oooo/-`.o: :ooo/` `/+. ./.:ooooooooo
/oooooo+o+``++. `:+- /oooooooo/
.ooooooooo/`` -+:` :ooooooooo.
/ooooooooo+--+/` .+ooooooooo/
/ooooooooooo+.` `.:++:oooooooo/
:oooooooooooooo++++oo+-` .ooooooo:
.+ooooooooooooooooooo+:..ooooo+.
-/oooooooooooooooooooooooo/-
`-/oooooooooooooooooo/:`
.-:/++oooo++/:-.
EOF
;;
"Ubuntu Budgie"* | "Ubuntu-Budgie"*)
set_colors 4 7 1 set_colors 4 7 1
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c2} ./oydmMMMMMMmdyo/. ${c2} ./oydmMMMMMMmdyo/.
@ -9939,7 +10001,7 @@ ${c4} `soooo. .oooo`
EOF EOF
;; ;;
"Ubuntu-MATE"*) "Ubuntu MATE"* | "Ubuntu-MATE"*)
set_colors 2 7 set_colors 2 7
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} `:+shmNNMMNNmhs+:` ${c1} `:+shmNNMMNNmhs+:`
@ -9989,7 +10051,7 @@ ${c3} `oo++.
EOF EOF
;; ;;
"Ubuntu-Studio") "Ubuntu Studio"* | "Ubuntu-Studio")
set_colors 6 7 set_colors 6 7
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} ..-::::::-.` ${c1} ..-::::::-.`