From f572fb37a01417c571f89ce7481b51e03cc614e3 Mon Sep 17 00:00:00 2001 From: Suleyman Poyraz <22801690+Zaryob@users.noreply.github.com> Date: Fri, 11 Jun 2021 08:24:32 +0300 Subject: [PATCH 1/5] Added PuffOS successfuly instead of #1659 (#1678) Co-authored-by: dylan --- neofetch | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 2c39e783..942dfe69 100755 --- a/neofetch +++ b/neofetch @@ -799,9 +799,9 @@ image_source="auto" # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, -# Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, -# Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rocky, -# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, +# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, +# Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, @@ -5089,7 +5089,7 @@ ASCII: openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, - Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, + Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, @@ -9491,6 +9491,25 @@ ${c1} /\\ EOF ;; + "PuffOS"*) + set_colors 3 + read -rd '' ascii_data <<'EOF' +${c1} + _,..._,m, + ,/' '""; + / ". + ,'mmmMMMMmm. \ + _/-"^^^^^"""%#%mm, ; + ,m,_,' "###) ;, +(###% \#/ ;##mm. + ^#/ __ ___ ; (######) + ; //.\\ //.\\ ; \####/ + _; (#\"// \\"/#) ; ,/ +@##\ \##/ = `"=" ,;mm/ +`\##>.____,...,____,<####@ +EOF + ;; + "Proxmox"*) set_colors 7 202 read -rd '' ascii_data <<'EOF' From 6b755b7ac69af5d7df648575e3d55fffbcd8101e Mon Sep 17 00:00:00 2001 From: Jonas Frei <8ec426b4-7173-428a-a6dc-3c520b45b0e2@wwsxrfc8.anonaddy.com> Date: Fri, 11 Jun 2021 07:24:51 +0200 Subject: [PATCH 2/5] Added 'hikari' to supported WMs (#1669) Co-authored-by: Jonas Frei --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 942dfe69..a5f4314f 100755 --- a/neofetch +++ b/neofetch @@ -1894,6 +1894,7 @@ get_wm() { -e gnome-shell \ -e greenfield \ -e grefsen \ + -e hikari \ -e kwin \ -e lipstick \ -e maynard \ From 3514e02d61a7ee880b325436e8454e5d56eb07df Mon Sep 17 00:00:00 2001 From: jrt Date: Fri, 11 Jun 2021 07:25:40 +0200 Subject: [PATCH 3/5] add AsteroidOS (#1676) --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index a5f4314f..dfbe1404 100755 --- a/neofetch +++ b/neofetch @@ -6149,6 +6149,29 @@ ${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy EOF ;; + "AsteroidOS"*) + set_colors 160 208 202 214 + read -rd '' ascii_data <<'EOF' +${c1} *** +${c1} ***** +${c1} ********** +${c1} *************** +${c1} *///****////****////. +${c2} (/////// /////// ///////( +${c2} /(((((//* //, //((((((. +${c2} ((((((((((( ((( (((((((( +${c2} *((((((((((((((((((((((( (((((((( +${c3} (((((#(((((((#((((( ((#((((( +${c3} (#(#(#####(#(#, ####(#(# +${c3} ######### ######## +${c3} /######## ######## +${c4} #######%####### +${c4} (#%%%%%%%# +${c4} %%%%% +${c4} %%% +EOF + ;; + "Bedrock"*) set_colors 8 7 read -rd '' ascii_data <<'EOF' From 9b708d6e5fd4e0651fb218b7f63f9cbf14c6deda Mon Sep 17 00:00:00 2001 From: Tiny Date: Fri, 11 Jun 2021 05:25:57 +0000 Subject: [PATCH 4/5] fix:The main version file of GNU/Deepin Linux has been moved from /etc/deepin-version to /etc/os-version (#1667) Description: Log: --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index dfbe1404..f3367be7 100755 --- a/neofetch +++ b/neofetch @@ -1840,7 +1840,7 @@ get_de() { Xfce*) de_ver=$(xfce4-session --version) ;; GNOME*) de_ver=$(gnome-shell --version) ;; Cinnamon*) de_ver=$(cinnamon --version) ;; - Deepin*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; + Deepin*) de_ver=$(awk -F'=' '/MajorVersion/ {print $2}' /etc/os-version) ;; Budgie*) de_ver=$(budgie-desktop --version) ;; LXQt*) de_ver=$(lxqt-session --version) ;; Lumina*) de_ver=$(lumina-desktop --version 2>&1) ;; From 13cda3f7e40a79e3f4e7d64d6f13e134c1f75c4a Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Thu, 10 Jun 2021 22:30:28 -0700 Subject: [PATCH 5/5] neofetch: Fix Terminal Font for mintty (#1641) * neofetch: Fix Terminal Font for mintty * Quiet shellcheck error --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f3367be7..5cf2f5b1 100755 --- a/neofetch +++ b/neofetch @@ -3452,7 +3452,7 @@ END ;; "mintty") - term_font="$(awk -F '=' '!/^($|#)/ && /Font/ {printf $2; exit}' "${HOME}/.minttyrc")" + term_font="$(awk -F '=' '!/^($|#)/ && /^\\s*Font\\s*=/ {printf $2; exit}' "${HOME}/.minttyrc")" ;; "pantheon"*)