From 58e90e8f299ba9120171019c186a7c01cc618460 Mon Sep 17 00:00:00 2001 From: aosync Date: Sun, 10 May 2020 12:58:11 +0200 Subject: [PATCH 1/3] es shell support (no shell version) (#1456) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0646d669..64b45c96 100755 --- a/neofetch +++ b/neofetch @@ -1594,7 +1594,7 @@ get_shell() { shell+=${BASH_VERSION/-*} ;; - sh|ash|dash) ;; + sh|ash|dash|es) ;; *ksh) shell+=$("$SHELL" -c "printf %s \"\$KSH_VERSION\"") From 564ee212f3507df6a5f9f680fb4ccea4b8c1b7d7 Mon Sep 17 00:00:00 2001 From: ulkuderner Date: Sun, 10 May 2020 13:58:26 +0300 Subject: [PATCH 2/3] Added SambaBOX logo (#1455) Added SamBOX logo to os logos. --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 64b45c96..7c7c860e 100755 --- a/neofetch +++ b/neofetch @@ -10181,6 +10181,31 @@ ${c3}#######${c2}#${c1}#####${c2}#${c3}####### ${c3} #####${c2}#######${c3}##### EOF ;; + "Profelis SambaBOX"* | "SambaBOX"*) + set_colors 3 6 + read -rd '' ascii_data <<'EOF' +${c1} + # + *////##### + /////////#########( + .((((((///// ,####(#((((( + /#######(((* (#(((((((((. +//((#(#(#, ((##( ,((((((// +////// #(##########( ////// +////// ((#(#(#(#(##########(///////// +/////( (((((((#########(##((((((///// +/(((#( ((((/ +####(# ((### +#########(((/////////(((((((((, (#(#( +########( /////////(((((((* ##### +####///, *////((( ((((((( +./////////// .//((((((((( + ///////////, *(/////((((* + ,/(((((((((##########/. + .((((((####### + ((##* +EOF + ;; "SunOS") set_colors 3 7 @@ -10220,6 +10245,7 @@ oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ .odNm+ /dNms. EOF ;; + esac ;; esac From 027c80ce4fc6cf1a2a5203fc3463510b1139cede Mon Sep 17 00:00:00 2001 From: Georgy Komarov Date: Fri, 15 May 2020 21:27:35 +0300 Subject: [PATCH 3/3] Add OS Elbrus support (#1459) --- neofetch | 38 ++++++++++++++++++++++++++++++++++---- neofetch.1 | 4 ++-- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 7c7c860e..412eea0d 100755 --- a/neofetch +++ b/neofetch @@ -774,8 +774,8 @@ image_source="auto" # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, # NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, -# OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, -# Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, +# 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, @@ -958,6 +958,12 @@ get_distro() { *) distro="Siduction ($(lsb_release -sic))" esac + elif [[ -f /etc/mcst_version ]]; then + case $distro_shorthand in + on|tiny) distro="OS Elbrus" ;; + *) distro="OS Elbrus $(< /etc/mcst_version)" + esac + elif type -p pveversion >/dev/null; then case $distro_shorthand in on|tiny) distro="Proxmox VE" ;; @@ -2387,6 +2393,10 @@ get_gpu() { [[ -z "$(trim "$gpu")" ]] && gpu="Intel Integrated Graphics" ;; + *"MCST"*) + gpu="${gpu/*MCST*MGA2*/MCST MGA2}" + ;; + *"VirtualBox"*) gpu="VirtualBox Graphics Adapter" ;; @@ -4854,8 +4864,8 @@ ASCII: Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, - OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, - Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, + 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, @@ -8403,6 +8413,26 @@ ${c1} EOF ;; + "OS Elbrus"*) + set_colors 4 7 3 + read -rd '' ascii_data <<'EOF' +${c1} ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + ██▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀██ + ██ ██ + ██ ███████ ███████ ██ + ██ ██ ██ ██ ██ ██ + ██ ██ ██ ██ ██ ██ + ██ ██ ██ ██ ██ ██ + ██ ██ ██ ██ ██ ██ + ██ ██ ███████ ███████ + ██ ██ ██ + ██ ██▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄██ + ██ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀██ + ██ ██ + ███████████████████████████ +EOF + ;; + "PacBSD"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index 22d21105..6c1f70eb 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -304,8 +304,8 @@ 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, PacBSD, Parabola, Pardus, Parrot, -Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, +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,