From d57463b0d3dedd1f5d722308735fc1737080119a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=A9TriMoon=E2=84=A2?= Date: Mon, 31 Oct 2022 14:15:44 +0300 Subject: [PATCH] Update neofetch Separating calculations as shown in https://github.com/dylanaraps/neofetch/pull/2225#issuecomment-1296882170 --- neofetch | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index ef76628c..3618dd57 100755 --- a/neofetch +++ b/neofetch @@ -2811,17 +2811,20 @@ get_memory() { tib) mem_label=TiB memory_unit_divider=$((1024 * 1024)) - printf -v mem_used "%'.*f" \ - "${mem_precision}" \ - $((mem_used / memory_unit_divider)).$((mem_used % memory_unit_divider)) - printf -v mem_total "%'.*f" \ - "${mem_precision}" \ - $((mem_total / memory_unit_divider)).$((mem_total % memory_unit_divider)) ;; gib) mem_label=GiB memory_unit_divider=1024 + ;; + + kib) + mem_label=KiB + ;; + esac + + case $mem_label in + GiB|TiB) printf -v mem_used "%'.*f" \ "${mem_precision}" \ $((mem_used / memory_unit_divider)).$((mem_used % memory_unit_divider)) @@ -2830,11 +2833,10 @@ get_memory() { $((mem_total / memory_unit_divider)).$((mem_total % memory_unit_divider)) ;; - kib) + KiB) mem_used=$((mem_used * 1024)) mem_total=$((mem_total * 1024)) - mem_label=KiB - ;; + ;; esac memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB} ${mem_perc:+(${mem_perc}%)}"