From 8480ef541ad378a7ba90ce5eb62bcbd291698dcc Mon Sep 17 00:00:00 2001 From: oshaboy Date: Thu, 9 Sep 2021 22:02:52 +0300 Subject: [PATCH 1/9] Add Linspire --- neofetch | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index d4fe3d1b..fa57133f 100755 --- a/neofetch +++ b/neofetch @@ -13,7 +13,7 @@ # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# to use, copy, modify, merge, publish, distribute, sublicen se, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: # @@ -794,7 +794,7 @@ image_source="auto" # Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, # KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, # Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, -# Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, +# Mer, Minix, Linspire, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, # Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, @@ -998,7 +998,17 @@ get_distro() { on|tiny) distro="OS Elbrus" ;; *) distro="OS Elbrus $(< /etc/mcst_version)" esac - + elif [[ -f /etc/linspire-version ]]; then + case $distro_shorthand in + on|tiny) distro="Linspire" ;; + *) distro="Linspire $(awk '/Version/ {print $2}' /etc/linspire-version)" + esac + elif [[ -f /etc/lindowsos-version ]]; then + case $distro_shorthand in + on|tiny) distro="LindowsOS" ;; + *) distro="$(awk '/Version/ {print $2,$3}' /etc/lindowsos-version)" + echo $distro + esac elif type -p pveversion >/dev/null; then case $distro_shorthand in on|tiny) distro="Proxmox VE" ;; @@ -5137,7 +5147,7 @@ ASCII: GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, - Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, LinuxMint, + Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, Linspire, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, @@ -8638,7 +8648,25 @@ ${c2} -sdhyo+:-` -/syymm: `::ohdmds-` EOF ;; - + + "Linspire"* | "Freespire"* | "Lindows"*) + set_colors 4 2 + read -rd '' ascii_data <<'EOF' +${c2} __^ +${c2} __/ \\ +${c2} MMy dMy __/ \\ +${c2} dMMy MMy ${c1}MM${c2} \\ +${c2} MMMy ,, ${c1}dMMMMn ${c2}\\ +${c2} dMMy dMM dMMMMMMy ${c1}dMM MM dMMMMMy dMM MM.nMMM dMMMMMM +${c1}MMM ${c2}MMy MMy MMy ${c1}dMM MMy MMy MMy MMy dy dMy +${c1}MMM ${c2}dMM dMM MMy ${c1}dMMMMy dMM dMM dMM dMM dMMMMMMM +${c2} dMMy MMy MMy MMy ${c1}dMMy MM MMy MMy MMy dMM +${c2}dMMy dMM dMM dMM ${c1}dMM MMy dMMMMMy dMM dMM MMy MM +${c2}MMMMMMMMMM MMy MMy MMy ${c1}dMMMyyy MMy MMy MMy dMMMMMMy +${c2} ${c1}dy +EOF + ;; + "linuxmint_small"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' From 0df597d38cbad96d0e7cf632af1a075c65d1b067 Mon Sep 17 00:00:00 2001 From: oshaboy Date: Thu, 9 Sep 2021 22:04:17 +0300 Subject: [PATCH 2/9] Fixed Errant Space --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fa57133f..d87e46c0 100755 --- a/neofetch +++ b/neofetch @@ -13,7 +13,7 @@ # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicen se, and/or sell +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: # From b611400e3b6f7c816d8fd16b90ca04af68e3baef Mon Sep 17 00:00:00 2001 From: oshaboy Date: Thu, 9 Sep 2021 22:20:42 +0300 Subject: [PATCH 3/9] removed line --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index d87e46c0..5bda4197 100755 --- a/neofetch +++ b/neofetch @@ -1007,7 +1007,6 @@ get_distro() { case $distro_shorthand in on|tiny) distro="LindowsOS" ;; *) distro="$(awk '/Version/ {print $2,$3}' /etc/lindowsos-version)" - echo $distro esac elif type -p pveversion >/dev/null; then case $distro_shorthand in From f58ba59b0bc3951e4700e15f9962065b4804944b Mon Sep 17 00:00:00 2001 From: oshaboy Date: Fri, 10 Sep 2021 17:06:09 +0300 Subject: [PATCH 4/9] newlines --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 5bda4197..24ad20b3 100755 --- a/neofetch +++ b/neofetch @@ -998,16 +998,19 @@ get_distro() { on|tiny) distro="OS Elbrus" ;; *) distro="OS Elbrus $(< /etc/mcst_version)" esac + elif [[ -f /etc/linspire-version ]]; then case $distro_shorthand in on|tiny) distro="Linspire" ;; *) distro="Linspire $(awk '/Version/ {print $2}' /etc/linspire-version)" esac + elif [[ -f /etc/lindowsos-version ]]; then case $distro_shorthand in on|tiny) distro="LindowsOS" ;; *) distro="$(awk '/Version/ {print $2,$3}' /etc/lindowsos-version)" esac + elif type -p pveversion >/dev/null; then case $distro_shorthand in on|tiny) distro="Proxmox VE" ;; From e95c8ebe5f583730ee24947a022d79dd02f846bb Mon Sep 17 00:00:00 2001 From: oshaboy Date: Sun, 13 Mar 2022 01:42:38 +0200 Subject: [PATCH 5/9] Revert "newlines" This reverts commit f58ba59b0bc3951e4700e15f9962065b4804944b. --- neofetch | 3 --- 1 file changed, 3 deletions(-) diff --git a/neofetch b/neofetch index 5995b583..4920dd7a 100755 --- a/neofetch +++ b/neofetch @@ -998,19 +998,16 @@ get_distro() { on|tiny) distro="OS Elbrus" ;; *) distro="OS Elbrus $(< /etc/mcst_version)" esac - elif [[ -f /etc/linspire-version ]]; then case $distro_shorthand in on|tiny) distro="Linspire" ;; *) distro="Linspire $(awk '/Version/ {print $2}' /etc/linspire-version)" esac - elif [[ -f /etc/lindowsos-version ]]; then case $distro_shorthand in on|tiny) distro="LindowsOS" ;; *) distro="$(awk '/Version/ {print $2,$3}' /etc/lindowsos-version)" esac - elif type -p pveversion >/dev/null; then case $distro_shorthand in on|tiny) distro="Proxmox VE" ;; From 54300031f90b9f0432bec5a1d3992c6fe452832a Mon Sep 17 00:00:00 2001 From: oshaboy Date: Sun, 13 Mar 2022 01:48:10 +0200 Subject: [PATCH 6/9] Revert "Revert "newlines"" This reverts commit e95c8ebe5f583730ee24947a022d79dd02f846bb. --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 4920dd7a..5995b583 100755 --- a/neofetch +++ b/neofetch @@ -998,16 +998,19 @@ get_distro() { on|tiny) distro="OS Elbrus" ;; *) distro="OS Elbrus $(< /etc/mcst_version)" esac + elif [[ -f /etc/linspire-version ]]; then case $distro_shorthand in on|tiny) distro="Linspire" ;; *) distro="Linspire $(awk '/Version/ {print $2}' /etc/linspire-version)" esac + elif [[ -f /etc/lindowsos-version ]]; then case $distro_shorthand in on|tiny) distro="LindowsOS" ;; *) distro="$(awk '/Version/ {print $2,$3}' /etc/lindowsos-version)" esac + elif type -p pveversion >/dev/null; then case $distro_shorthand in on|tiny) distro="Proxmox VE" ;; From 4efe946bfdd30a5cafddbb9c32979d596ad8113e Mon Sep 17 00:00:00 2001 From: oshaboy Date: Sun, 13 Mar 2022 01:48:16 +0200 Subject: [PATCH 7/9] Revert "Merge branch 'master' into pr/1905" This reverts commit 89e716160d156587df79c32a7ddccf349f699abe, reversing changes made to f58ba59b0bc3951e4700e15f9962065b4804944b. --- LICENSE.md | 2 +- neofetch | 153 +++++++++++------------------------------------------ neofetch.1 | 2 +- 3 files changed, 32 insertions(+), 125 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index eeb066f7..a4f19eb8 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2021 Dylan Araps +Copyright (c) 2015-2020 Dylan Araps Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/neofetch b/neofetch index 5995b583..24ad20b3 100755 --- a/neofetch +++ b/neofetch @@ -8,7 +8,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2015-2021 Dylan Araps +# Copyright (c) 2015-2020 Dylan Araps # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -786,7 +786,7 @@ image_source="auto" # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, # Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, -# Container_Linux, Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, +# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, @@ -799,14 +799,14 @@ image_source="auto" # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, -# Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, +# 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, SkiffOS, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, -# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc, +# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc, # Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. # NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. @@ -1114,13 +1114,10 @@ get_distro() { fi if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then - windows_version=$(wmic.exe os get Version) - windows_version=$(trim "${windows_version/Version}") - case $distro_shorthand in - on) distro+=" [Windows $windows_version]" ;; - tiny) distro="Windows ${windows_version::2}" ;; - *) distro+=" on Windows $windows_version" ;; + on) distro+=" [Windows 10]" ;; + tiny) distro="Windows 10" ;; + *) distro+=" on Windows 10" ;; esac elif [[ $(< /proc/version) == *chrome-bot* || -f /dev/cros_ec ]]; then @@ -1250,11 +1247,6 @@ get_model() { if [[ -d /system/app/ && -d /system/priv-app ]]; then model="$(getprop ro.product.brand) $(getprop ro.product.model)" - elif [[ -f /sys/devices/virtual/dmi/id/board_vendor || - -f /sys/devices/virtual/dmi/id/board_name ]]; then - model=$(< /sys/devices/virtual/dmi/id/board_vendor) - model+=" $(< /sys/devices/virtual/dmi/id/board_name)" - elif [[ -f /sys/devices/virtual/dmi/id/product_name || -f /sys/devices/virtual/dmi/id/product_version ]]; then model=$(< /sys/devices/virtual/dmi/id/product_name) @@ -1569,14 +1561,12 @@ get_packages() { has lvu && tot lvu installed has tce-status && tot tce-status -i has pkg_info && tot pkg_info - has pkgin && tot pkgin list has tazpkg && pkgs_h=6 tot tazpkg list && ((packages-=6)) has sorcery && tot gaze installed has alps && tot alps showinstalled has butch && tot butch list has swupd && tot swupd bundle-list --quiet has pisi && tot pisi li - has pacstall && tot pacstall -L # Using the dnf package cache is much faster than rpm. if has dnf && type -p sqlite3 >/dev/null && [[ -f /var/cache/dnf/packages.db ]]; then @@ -1761,12 +1751,6 @@ get_shell() { shell=${shell/Copyright*} ;; - nu) - shell+=$("$SHELL" -c "version | get version") - shell=${shell/ $shell_name} - ;; - - *) shell+=$("$SHELL" --version 2>&1) shell=${shell/ $shell_name} @@ -2518,7 +2502,7 @@ get_gpu() { gpu_cmd="$(lspci -mm | awk -F '\"|\" \"|\\(' \ '/"Display|"3D|"VGA/ { - a[$0] = $1 " " $3 " " ($(NF-1) ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $(NF-1)) + a[$0] = $1 " " $3 " " ($7 ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $7) } END { for (i in a) { if (!seen[a[i]]++) { @@ -5158,7 +5142,7 @@ ASCII: BlackArch, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, - Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, + CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, @@ -5171,14 +5155,14 @@ ASCII: openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, - Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, 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, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, - Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc, + Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. @@ -6552,29 +6536,6 @@ ${c2} .......... EOF ;; - "CBL-Mariner"*) - set_colors 6 - read -rd '' ascii_data <<'EOF' -${c1} . - :- . - :==. .=: - :===: -==: - :-===: .====: - :-====- -=====: - -====== :=======: - -======. .=========: - -======: -==========. - -======- -===========. - :======- :===========. - :=======. .-==========. - :=======: -==========. - :=======- :==========. - :=======- .-========- -:--------. :========- - ..:::--=========- - ..::---================-=- -EOF - ;; "CelOS"*) set_colors 4 6 0 5 @@ -6937,7 +6898,7 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; - *"Crystal Linux"*) + *"CrystalUX"*) set_colors 13 5 read -rd '' ascii_data <<'EOF' ${c1} mysssym @@ -9152,29 +9113,23 @@ EOF "openEuler"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} `.cc.` - ``.cccccccc..` - `.cccccccccccccccc.` - ``.cccccccccccccccccccccc.`` - `..cccccccccccccccccccccccccccc..` -`.ccccccccccccccc${c2}/++/${c1}ccccccccccccccccc.` -.ccccccccccccccc${c2}mNMMNdo+oso+${c1}ccccccccccc. -.cccccccccc${c2}/++odms+//+mMMMMm/:+syso/${c1}cccc -.ccccccccc${c2}yNNMMMs:::/::+o+/:${c1}c${c2}dMMMMMm${c1}cccc -.ccccccc${c2}:+NmdyyhNNmNNNd:${c1}ccccc${c1}${c2}:oyyyo:${c1}cccc -.ccc${c2}:ohdmMs:${c1}cccc${c2}+mNMNmy${c1}ccccccccccccccccc -.cc${c2}/NMMMMMo////:${c1}c${c2}:///:${c1}cccccccccccccccccc -.cc${c2}:syysyNMNNNMNy${c1}ccccccccccccccccccccccc -.cccccccc${c2}+MMMMMNy${c1}c${c2}:/+++/${c1}cccccccccccccccc -.ccccccccc${c2}ohhhs/${c1}c${c2}omMMMMNh${c1}ccccccccccccccc -.ccccccccccccccc${c2}:MMMMMMMM/${c1}cccccccccccccc -.cccccccccccccccc${c2}sNNNNNd+${c1}cccccccccccccc. -`..cccccccccccccccc${c2}/+/:${c1}cccccccccccccc..` - ``.cccccccccccccccccccccccccccc.`` - `.cccccccccccccccccccccc.` - ``.cccccccccccccc.`` - `.cccccccc.` - `....` +${c1} + (##### + (((######## ##### + ((( ########## __...__ + (((((((( ####### /((((((###\ + ((((((((((( ....... \(((((####/ + (((((( ((((######### ******* + %((((((# ((######## + /////((((( ### +/////(((((((# (((& + ((((((((((((( + (((((((((((( + ((((((((( ((((((### + /((((((###### + //((((((###### + /((((((##### + *********/ EOF ;; @@ -9894,27 +9849,6 @@ ${c1} `..--..` EOF ;; - "Qubyt"*) - set_colors 4 5 0 4 - read -rd '' ascii_data <<'EOF' -${c1} ########################${c2}(${c3}ooo -${c1} ########################${c2}(${c3}ooo -${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo -${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo -${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo -${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo -${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo -${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo -${c1}###${c2}(${c3}ooo ${c1}##${c3}o ${c2}((((${c3}ooo -${c1}###${c2}(${c3}ooo o${c2}((${c1}### ${c3}oooooo -${c1}###${c2}(${c3}ooo oo${c2}((${c1}###${c3}o -${c1}###${c2}(${c3}ooo ooo${c2}((${c1}### -${c1}################${c2}(${c3}oo oo${c2}((((${c3}o -${c2}(((((((((((((((((${c3}ooo ooooo - oooooooooooooooooo o -EOF - ;; - "Quibian"*) set_colors 3 7 read -rd '' ascii_data <<'EOF' @@ -11169,33 +11103,6 @@ EOF ;; - "VNux"*) - set_colors 11 8 15 1 7 - read -rd '' ascii_data <<'EOF' -${c1} ` - ^[XOx~. - ^_nwdbbkp0ti' - -${c2} _j>!vC1,, - ${c4},${c2} ,CY${c3}O${c2}t${c3}O${c2}1(l;" -`${c4}~-{r(1I${c2} ^${c1}/zmwJuc:${c2}I^ -'${c4}?)|${c1}U${c4}/}-${c2} ^${c3}f${c1}OCLLOw${c3}_${c2},; - ,${c4}i,``. ${c2}",${c3}k%ooW@$d"${c2}I,' - ' ;^${c3}u$$$$$$$$^<${c2}:^ - ` .>>${c3}($$${c5}$@@@@$$${c3}$nl${c2}[:: - `!}?${c3}B$${c5}%&WMMW&%$${c3}$1}-${c2}}": - ^?j${c3}Z$${c5}WMMWWWWMMW$${c3}ofc${c2};;` - <~x&${c3}$${c5}&MWWWWWWWWp${c3}-${c5}l>[< -${c1} 'ljmwn${c2}~tk8${c5}MWWWWM8O${c2}X${c1}r${c2}+]nC${c1}[ -!JZqwwdX${c2}:^C8${c5}#MMMM@${c2}X${c1}Odpdpq0< - ^x00J(" - ^" -EOF - - ;; - "LangitKetujuh"*) set_colors 7 4 read -rd '' ascii_data <<'EOF' @@ -11608,7 +11515,7 @@ main() { err "Neofetch command: $0 $*" err "Neofetch version: $version" - [[ $verbose == on ]] && printf '%b\033[m' "$err" >&2 + [[ $verbose == on ]] && printf %b "$err" >&2 # If `--loop` was used, constantly redraw the image. while [[ $image_loop == on && $image_backend == w3m ]]; do diff --git a/neofetch.1 b/neofetch.1 index b90b5781..f17a21be 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -327,7 +327,7 @@ SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Cinnamon, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, -Ubuntu\-Studio, Ubuntu, Univention, Venom, Void, VNux, semc, Obarun, +Ubuntu\-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. .IP NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. From 34ac93d6c3073870c4b51f012d8bf5c128a787aa Mon Sep 17 00:00:00 2001 From: oshaboy Date: Sun, 13 Mar 2022 01:49:09 +0200 Subject: [PATCH 8/9] Revert "Revert "Merge branch 'master' into pr/1905"" This reverts commit 4efe946bfdd30a5cafddbb9c32979d596ad8113e. --- LICENSE.md | 2 +- neofetch | 153 ++++++++++++++++++++++++++++++++++++++++++----------- neofetch.1 | 2 +- 3 files changed, 125 insertions(+), 32 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index a4f19eb8..eeb066f7 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2020 Dylan Araps +Copyright (c) 2015-2021 Dylan Araps Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/neofetch b/neofetch index 24ad20b3..5995b583 100755 --- a/neofetch +++ b/neofetch @@ -8,7 +8,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2015-2020 Dylan Araps +# Copyright (c) 2015-2021 Dylan Araps # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -786,7 +786,7 @@ image_source="auto" # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, # Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, -# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, +# Container_Linux, Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, @@ -799,14 +799,14 @@ image_source="auto" # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, -# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, +# Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, -# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc, +# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc, # Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. # NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. @@ -1114,10 +1114,13 @@ get_distro() { fi if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then + windows_version=$(wmic.exe os get Version) + windows_version=$(trim "${windows_version/Version}") + case $distro_shorthand in - on) distro+=" [Windows 10]" ;; - tiny) distro="Windows 10" ;; - *) distro+=" on Windows 10" ;; + on) distro+=" [Windows $windows_version]" ;; + tiny) distro="Windows ${windows_version::2}" ;; + *) distro+=" on Windows $windows_version" ;; esac elif [[ $(< /proc/version) == *chrome-bot* || -f /dev/cros_ec ]]; then @@ -1247,6 +1250,11 @@ get_model() { if [[ -d /system/app/ && -d /system/priv-app ]]; then model="$(getprop ro.product.brand) $(getprop ro.product.model)" + elif [[ -f /sys/devices/virtual/dmi/id/board_vendor || + -f /sys/devices/virtual/dmi/id/board_name ]]; then + model=$(< /sys/devices/virtual/dmi/id/board_vendor) + model+=" $(< /sys/devices/virtual/dmi/id/board_name)" + elif [[ -f /sys/devices/virtual/dmi/id/product_name || -f /sys/devices/virtual/dmi/id/product_version ]]; then model=$(< /sys/devices/virtual/dmi/id/product_name) @@ -1561,12 +1569,14 @@ get_packages() { has lvu && tot lvu installed has tce-status && tot tce-status -i has pkg_info && tot pkg_info + has pkgin && tot pkgin list has tazpkg && pkgs_h=6 tot tazpkg list && ((packages-=6)) has sorcery && tot gaze installed has alps && tot alps showinstalled has butch && tot butch list has swupd && tot swupd bundle-list --quiet has pisi && tot pisi li + has pacstall && tot pacstall -L # Using the dnf package cache is much faster than rpm. if has dnf && type -p sqlite3 >/dev/null && [[ -f /var/cache/dnf/packages.db ]]; then @@ -1751,6 +1761,12 @@ get_shell() { shell=${shell/Copyright*} ;; + nu) + shell+=$("$SHELL" -c "version | get version") + shell=${shell/ $shell_name} + ;; + + *) shell+=$("$SHELL" --version 2>&1) shell=${shell/ $shell_name} @@ -2502,7 +2518,7 @@ get_gpu() { gpu_cmd="$(lspci -mm | awk -F '\"|\" \"|\\(' \ '/"Display|"3D|"VGA/ { - a[$0] = $1 " " $3 " " ($7 ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $7) + a[$0] = $1 " " $3 " " ($(NF-1) ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $(NF-1)) } END { for (i in a) { if (!seen[a[i]]++) { @@ -5142,7 +5158,7 @@ ASCII: BlackArch, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, - CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, + Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, @@ -5155,14 +5171,14 @@ ASCII: openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, - Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, + Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, 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, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, - Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc, + Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. @@ -6536,6 +6552,29 @@ ${c2} .......... EOF ;; + "CBL-Mariner"*) + set_colors 6 + read -rd '' ascii_data <<'EOF' +${c1} . + :- . + :==. .=: + :===: -==: + :-===: .====: + :-====- -=====: + -====== :=======: + -======. .=========: + -======: -==========. + -======- -===========. + :======- :===========. + :=======. .-==========. + :=======: -==========. + :=======- :==========. + :=======- .-========- +:--------. :========- + ..:::--=========- + ..::---================-=- +EOF + ;; "CelOS"*) set_colors 4 6 0 5 @@ -6898,7 +6937,7 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; - *"CrystalUX"*) + *"Crystal Linux"*) set_colors 13 5 read -rd '' ascii_data <<'EOF' ${c1} mysssym @@ -9113,23 +9152,29 @@ EOF "openEuler"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} - (##### - (((######## ##### - ((( ########## __...__ - (((((((( ####### /((((((###\ - ((((((((((( ....... \(((((####/ - (((((( ((((######### ******* - %((((((# ((######## - /////((((( ### -/////(((((((# (((& - ((((((((((((( - (((((((((((( - ((((((((( ((((((### - /((((((###### - //((((((###### - /((((((##### - *********/ +${c1} `.cc.` + ``.cccccccc..` + `.cccccccccccccccc.` + ``.cccccccccccccccccccccc.`` + `..cccccccccccccccccccccccccccc..` +`.ccccccccccccccc${c2}/++/${c1}ccccccccccccccccc.` +.ccccccccccccccc${c2}mNMMNdo+oso+${c1}ccccccccccc. +.cccccccccc${c2}/++odms+//+mMMMMm/:+syso/${c1}cccc +.ccccccccc${c2}yNNMMMs:::/::+o+/:${c1}c${c2}dMMMMMm${c1}cccc +.ccccccc${c2}:+NmdyyhNNmNNNd:${c1}ccccc${c1}${c2}:oyyyo:${c1}cccc +.ccc${c2}:ohdmMs:${c1}cccc${c2}+mNMNmy${c1}ccccccccccccccccc +.cc${c2}/NMMMMMo////:${c1}c${c2}:///:${c1}cccccccccccccccccc +.cc${c2}:syysyNMNNNMNy${c1}ccccccccccccccccccccccc +.cccccccc${c2}+MMMMMNy${c1}c${c2}:/+++/${c1}cccccccccccccccc +.ccccccccc${c2}ohhhs/${c1}c${c2}omMMMMNh${c1}ccccccccccccccc +.ccccccccccccccc${c2}:MMMMMMMM/${c1}cccccccccccccc +.cccccccccccccccc${c2}sNNNNNd+${c1}cccccccccccccc. +`..cccccccccccccccc${c2}/+/:${c1}cccccccccccccc..` + ``.cccccccccccccccccccccccccccc.`` + `.cccccccccccccccccccccc.` + ``.cccccccccccccc.`` + `.cccccccc.` + `....` EOF ;; @@ -9849,6 +9894,27 @@ ${c1} `..--..` EOF ;; + "Qubyt"*) + set_colors 4 5 0 4 + read -rd '' ascii_data <<'EOF' +${c1} ########################${c2}(${c3}ooo +${c1} ########################${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}##${c3}o ${c2}((((${c3}ooo +${c1}###${c2}(${c3}ooo o${c2}((${c1}### ${c3}oooooo +${c1}###${c2}(${c3}ooo oo${c2}((${c1}###${c3}o +${c1}###${c2}(${c3}ooo ooo${c2}((${c1}### +${c1}################${c2}(${c3}oo oo${c2}((((${c3}o +${c2}(((((((((((((((((${c3}ooo ooooo + oooooooooooooooooo o +EOF + ;; + "Quibian"*) set_colors 3 7 read -rd '' ascii_data <<'EOF' @@ -11103,6 +11169,33 @@ EOF ;; + "VNux"*) + set_colors 11 8 15 1 7 + read -rd '' ascii_data <<'EOF' +${c1} ` + ^[XOx~. + ^_nwdbbkp0ti' + +${c2} _j>!vC1,, + ${c4},${c2} ,CY${c3}O${c2}t${c3}O${c2}1(l;" +`${c4}~-{r(1I${c2} ^${c1}/zmwJuc:${c2}I^ +'${c4}?)|${c1}U${c4}/}-${c2} ^${c3}f${c1}OCLLOw${c3}_${c2},; + ,${c4}i,``. ${c2}",${c3}k%ooW@$d"${c2}I,' + ' ;^${c3}u$$$$$$$$^<${c2}:^ + ` .>>${c3}($$${c5}$@@@@$$${c3}$nl${c2}[:: + `!}?${c3}B$${c5}%&WMMW&%$${c3}$1}-${c2}}": + ^?j${c3}Z$${c5}WMMWWWWMMW$${c3}ofc${c2};;` + <~x&${c3}$${c5}&MWWWWWWWWp${c3}-${c5}l>[< +${c1} 'ljmwn${c2}~tk8${c5}MWWWWM8O${c2}X${c1}r${c2}+]nC${c1}[ +!JZqwwdX${c2}:^C8${c5}#MMMM@${c2}X${c1}Odpdpq0< + ^x00J(" + ^" +EOF + + ;; + "LangitKetujuh"*) set_colors 7 4 read -rd '' ascii_data <<'EOF' @@ -11515,7 +11608,7 @@ main() { err "Neofetch command: $0 $*" err "Neofetch version: $version" - [[ $verbose == on ]] && printf %b "$err" >&2 + [[ $verbose == on ]] && printf '%b\033[m' "$err" >&2 # If `--loop` was used, constantly redraw the image. while [[ $image_loop == on && $image_backend == w3m ]]; do diff --git a/neofetch.1 b/neofetch.1 index f17a21be..b90b5781 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -327,7 +327,7 @@ SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Cinnamon, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, -Ubuntu\-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, +Ubuntu\-Studio, Ubuntu, Univention, Venom, Void, VNux, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. .IP NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. From a6ac4b411797cc494ad4a2b751d7808f7394e297 Mon Sep 17 00:00:00 2001 From: oshaboy Date: Tue, 15 Mar 2022 03:28:20 +0200 Subject: [PATCH 9/9] Revert "Merge branch 'pr/2011'" This reverts commit 23a94fd3896432b933591a0c5d8cbab418dc402e, reversing changes made to 34ac93d6c3073870c4b51f012d8bf5c128a787aa. --- neofetch | 28 ++-------------------------- neofetch.1 | 2 +- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/neofetch b/neofetch index b791b598..5995b583 100755 --- a/neofetch +++ b/neofetch @@ -789,7 +789,7 @@ image_source="auto" # Container_Linux, Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, -# FreeMiNT, Frugalware, Funtoo, FusionX, GalliumOS, Garuda, Gentoo, Pentoo, +# FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS # Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, # KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, @@ -5161,7 +5161,7 @@ ASCII: Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, - Funtoo, FusionX, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, + Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, @@ -7601,30 +7601,6 @@ xXXXXXX, cXXXNNNXXXXNNXXXXXXXXNNNNKOOK; d0O .k EOF ;; - "FusionX"*) - set_colors 4 4 7 - read -rd '' ascii_data <<'EOF' -${c2} - . - kXNNX - 0XXXXXNNk - XXXXXXXXXNK - .XXXXXXXXXXXNx - xXNW. 'XXXXXXXXXX. -'XXXXXNW0 ;XXXXXX -kXXXXXXXXXNW.${c3} MW. -${c2}0XXXXXXXXXXX.${c3}cXXXX; -${c2}lXXXXXXXXXd ${c3} ol . -${c2}.XXXXXk ONXXNW: - .K OXXXXXXNWK - 0XXXXXXXXXXNW. - KXXXXXXXXXXc - KXXXXXXXX - KXXXd - . -EOF - ;; - "GalliumOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index 802be9d3..b90b5781 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -310,7 +310,7 @@ Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, -FreeMiNT, Frugalware, Funtoo, FusionX, GalliumOS, Garuda, Gentoo, Pentoo, +FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE,