From 47d8dbcec8b6edbcee4676532f61132362c0a16d Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 17 Jul 2020 21:05:58 +0200 Subject: [PATCH 1/3] Detect Ubuntu flavors (#1507) --- neofetch | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index b72a55d2..c51bb016 100755 --- a/neofetch +++ b/neofetch @@ -1087,6 +1087,18 @@ get_distro() { distro=$(trim_quotes "$distro") 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} ;; + esac + fi ;; "Mac OS X"|"macOS") @@ -9890,7 +9902,7 @@ ${c1} ▀█████████ ███████${c2}███▀ EOF ;; - "Ubuntu-Budgie"*) + "Ubuntu Budgie"* | "Ubuntu-Budgie"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c2} ./oydmMMMMMMmdyo/. @@ -9938,7 +9950,7 @@ ${c4} `soooo. .oooo` EOF ;; - "Ubuntu-MATE"*) + "Ubuntu MATE"* | "Ubuntu-MATE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' ${c1} `:+shmNNMMNNmhs+:` @@ -9988,7 +10000,7 @@ ${c3} `oo++. EOF ;; - "Ubuntu-Studio") + "Ubuntu Studio"* | "Ubuntu-Studio") set_colors 6 7 read -rd '' ascii_data <<'EOF' ${c1} ..-::::::-.` From 3c63ac1d4a69cb032f112a1586907138e69475ce Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 20 Jul 2020 07:57:30 +0200 Subject: [PATCH 2/3] Add Ubuntu Cinnamon (#1508) --- neofetch | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index c51bb016..6ff4ff2f 100755 --- a/neofetch +++ b/neofetch @@ -1091,12 +1091,13 @@ get_distro() { # 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} ;; + *"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 ;; @@ -9902,6 +9903,32 @@ ${c1} ▀█████████ ███████${c2}███▀ EOF ;; + "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 read -rd '' ascii_data <<'EOF' From 96da4081006a881bb18b2879af1e8c7b449d246e Mon Sep 17 00:00:00 2001 From: Luke Yue Date: Thu, 23 Jul 2020 16:55:00 +0800 Subject: [PATCH 3/3] Add openEuler (#1510) Signed-off-by: Luke Yue --- neofetch | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 6ff4ff2f..f31996d4 100755 --- a/neofetch +++ b/neofetch @@ -776,10 +776,10 @@ image_source="auto" # LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, -# OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, -# Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, -# Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, +# NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, +# OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, +# Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, +# popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, # Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, # Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, # Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, @@ -4897,9 +4897,9 @@ ASCII: LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, - OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, OpenStage, - OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, - Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, + OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, + OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, + Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, @@ -8381,6 +8381,29 @@ ${c1} `-|.' /_. ${c4}\_| ${c1} F EOF ;; + "openEuler"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} + (##### + (((######## ##### + ((( ########## __...__ + (((((((( ####### /((((((###\ + ((((((((((( ....... \(((((####/ + (((((( ((((######### ******* + %((((((# ((######## + /////((((( ### +/////(((((((# (((& + ((((((((((((( + (((((((((((( + ((((((((( ((((((### + /((((((###### + //((((((###### + /((((((##### + *********/ +EOF + ;; + "OpenIndiana"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF'