From ee8d01ed2a37d480b64bd0c07450cf6352d2d3b2 Mon Sep 17 00:00:00 2001 From: Estela Xu Date: Tue, 1 Mar 2022 14:30:01 +0800 Subject: [PATCH 1/6] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 48b96d215..e35fb17e6 100755 --- a/neofetch +++ b/neofetch @@ -2449,7 +2449,7 @@ get_cpu() { cpu="${cpu//, * Compute Cores}" cpu="${cpu//Core / }" cpu="${cpu//(\"AuthenticAMD\"*)}" - cpu="${cpu//with Radeon * Graphics}" + cpu="${cpu//with Radeon*Graphics}" cpu="${cpu//, altivec supported}" cpu="${cpu//FPU*}" cpu="${cpu//Chip Revision*}" From b9e713f9e27695bc182bef3673e2fe01c0d2edf6 Mon Sep 17 00:00:00 2001 From: Estela ad Astra Date: Sun, 26 Jun 2022 00:58:21 +0800 Subject: [PATCH 2/6] use lscpu to get cpu name on arm architecture --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index e35fb17e6..009074483 100755 --- a/neofetch +++ b/neofetch @@ -2206,6 +2206,10 @@ get_cpu() { [[ -z "$cpu" ]] && cpu="$(awk -F':' '/family/ {printf $2; exit}' "$cpu_file")" ;; + "arm"* | "aarch64") + cpu="$(lscpu | grep "Vendor ID" | sed "s/.*: *//g") $(lscpu | grep "Model name" | sed "s/.*: *//g")" + ;; + *) cpu="$(awk -F '\\s*: | @' \ '/model name|Hardware|Processor|^cpu model|chip type|^cpu type/ { From a73f05e388e1908a42cbd86c3bcdc735d72f910c Mon Sep 17 00:00:00 2001 From: saeziae Date: Sun, 31 Jul 2022 00:06:46 +0800 Subject: [PATCH 3/6] use awk --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 009074483..ee77887a8 100755 --- a/neofetch +++ b/neofetch @@ -2207,7 +2207,11 @@ get_cpu() { ;; "arm"* | "aarch64") - cpu="$(lscpu | grep "Vendor ID" | sed "s/.*: *//g") $(lscpu | grep "Model name" | sed "s/.*: *//g")" + cpu="$(lscpu | awk -F': ' '/Vendor ID/ {print $2; exit}' ) $(lscpu | awk -F': ' '/Model name/ {print $2; exit}')" + ;; + + "riscv"*) + cpu="$(lscpu | awk -F': ' '/uarch/ {print $2; exit}' )" ;; *) From ac7be6d3d12ec6009bbef040fd09821ba2202548 Mon Sep 17 00:00:00 2001 From: saeziae Date: Sun, 31 Jul 2022 00:08:35 +0800 Subject: [PATCH 4/6] fix error --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ee77887a8..e42e60327 100755 --- a/neofetch +++ b/neofetch @@ -2211,7 +2211,7 @@ get_cpu() { ;; "riscv"*) - cpu="$(lscpu | awk -F': ' '/uarch/ {print $2; exit}' )" + cpu="$(awk -F': ' '/uarch/ {print $2; exit}' "$cpu_file")" ;; *) From 3253d4cbcc0d48e583ca8933c25cfa424adfc1ad Mon Sep 17 00:00:00 2001 From: saeziae Date: Sun, 31 Jul 2022 18:55:05 +0800 Subject: [PATCH 5/6] add loongarch --- neofetch | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index e42e60327..189013044 100755 --- a/neofetch +++ b/neofetch @@ -2207,13 +2207,24 @@ get_cpu() { ;; "arm"* | "aarch64") - cpu="$(lscpu | awk -F': ' '/Vendor ID/ {print $2; exit}' ) $(lscpu | awk -F': ' '/Model name/ {print $2; exit}')" + if [[ $(trim "$distro") == Android* ]]; then + # Android roms have modified cpuinfo that shows CPU model as a string + cpu="$(awk -F '\\s*: | @' \ + '/model name|Hardware|Processor|^cpu model|chip type|^cpu type/ { + cpu=$2; if ($1 == "Hardware") exit } END { print cpu }' "$cpu_file")" + else + cpu="$(lscpu | awk -F': ' '/Vendor ID/ {print $2; exit}' ) $(lscpu | awk -F': ' '/Model name/ {print $2; exit}')" + fi ;; - + "riscv"*) cpu="$(awk -F': ' '/uarch/ {print $2; exit}' "$cpu_file")" ;; - + + "loongarch"*) + cpu="$(awk -F': ' '/Model/ {print $2; exit}' "$cpu_file")" + ;; + *) cpu="$(awk -F '\\s*: | @' \ '/model name|Hardware|Processor|^cpu model|chip type|^cpu type/ { From fd2248daec83ac8fbd5a0f8f2d9a135588149732 Mon Sep 17 00:00:00 2001 From: saeziae Date: Thu, 8 Sep 2022 22:55:50 +0800 Subject: [PATCH 6/6] merge riscv and loongarch to others --- neofetch | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 189013044..89332df05 100755 --- a/neofetch +++ b/neofetch @@ -2209,25 +2209,15 @@ get_cpu() { "arm"* | "aarch64") if [[ $(trim "$distro") == Android* ]]; then # Android roms have modified cpuinfo that shows CPU model as a string - cpu="$(awk -F '\\s*: | @' \ - '/model name|Hardware|Processor|^cpu model|chip type|^cpu type/ { - cpu=$2; if ($1 == "Hardware") exit } END { print cpu }' "$cpu_file")" + cpu="$(awk -F':' '/Hardware/ {print $2; exit}' "$cpu_file")" else cpu="$(lscpu | awk -F': ' '/Vendor ID/ {print $2; exit}' ) $(lscpu | awk -F': ' '/Model name/ {print $2; exit}')" fi ;; - "riscv"*) - cpu="$(awk -F': ' '/uarch/ {print $2; exit}' "$cpu_file")" - ;; - - "loongarch"*) - cpu="$(awk -F': ' '/Model/ {print $2; exit}' "$cpu_file")" - ;; - *) cpu="$(awk -F '\\s*: | @' \ - '/model name|Hardware|Processor|^cpu model|chip type|^cpu type/ { + '/model name|Model|uarch|Hardware|Processor|^cpu model|chip type|^cpu type/ { cpu=$2; if ($1 == "Hardware") exit } END { print cpu }' "$cpu_file")" ;; esac