From 993cfbc62776cb6e17def9ec53751b0876312a1d Mon Sep 17 00:00:00 2001 From: Aaron Blakely Date: Mon, 4 Jul 2022 23:36:47 -0500 Subject: [PATCH 1/4] Added support for Mac OS X 10.4.11 --- neofetch | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 48b96d21..5f64b1db 100755 --- a/neofetch +++ b/neofetch @@ -1260,7 +1260,14 @@ get_model() { if [[ $(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC") != "" ]]; then model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" else - model=$(sysctl -n hw.model) + if [[ $osx_version =~ "10.4" ]]; then + model="$(system_profiler SPHardwareDataType | grep Machine\ Name\:)" + model=${model/Machine\ Name\:/} + + model="$model ($(sysctl -n hw.model))" + else + model=$(sysctl -n hw.model) + fi fi ;; @@ -2282,7 +2289,12 @@ get_cpu() { ;; "Mac OS X"|"macOS") - cpu="$(sysctl -n machdep.cpu.brand_string)" + if [[ $osx_version =~ "10.4" ]]; then + cpu="$(system_profiler SPHardwareDataType | grep CPU\ Type)" + cpu="${cpu/CPU\ Type\:/}" + else + cpu="$(sysctl -n machdep.cpu.brand_string)" + fi # Get CPU cores. case $cpu_cores in @@ -2704,13 +2716,25 @@ get_memory() { ;; "Mac OS X" | "macOS" | "iPhone OS") - hw_pagesize="$(sysctl -n hw.pagesize)" - mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))" - pages_app="$(($(sysctl -n vm.page_pageable_internal_count) - $(sysctl -n vm.page_purgeable_count)))" - pages_wired="$(vm_stat | awk '/ wired/ { print $4 }')" - pages_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')" - pages_compressed="${pages_compressed:-0}" - mem_used="$(((${pages_app} + ${pages_wired//.} + ${pages_compressed//.}) * hw_pagesize / 1024 / 1024))" + if [[ $osx_version =~ "10.4" ]]; then + mem_total="$(system_profiler SPHardwareDataType | grep Memory:)" + mem_total="${mem_total/Memory\: /}" + mem_total="${mem_total/ MB/}" + + mem_used="$(vm_stat | grep Pages\ active\:)" + mem_used="${mem_used/Pages active\: /}" + mem_used="${mem_used/\./}" + + mem_used=$((mem_used * 4096 / 1048576)) + else + hw_pagesize="$(sysctl -n hw.pagesize)" + mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))" + pages_app="$(($(sysctl -n vm.page_pageable_internal_count) - $(sysctl -n vm.page_purgeable_count)))" + pages_wired="$(vm_stat | awk '/ wired/ { print $4 }')" + pages_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')" + pages_compressed="${pages_compressed:-0}" + mem_used="$(((${pages_app} + ${pages_wired//.} + ${pages_compressed//.}) * hw_pagesize / 1024 / 1024))" + fi ;; "BSD" | "MINIX") From 55483a179d2005119ac68c4565014a1bb31ac2c5 Mon Sep 17 00:00:00 2001 From: Aaron Blakely Date: Tue, 5 Jul 2022 01:47:00 -0500 Subject: [PATCH 2/4] Added cpu speed and core count support for OS X Tiger --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index 5f64b1db..00c26d5a 100755 --- a/neofetch +++ b/neofetch @@ -2292,6 +2292,12 @@ get_cpu() { if [[ $osx_version =~ "10.4" ]]; then cpu="$(system_profiler SPHardwareDataType | grep CPU\ Type)" cpu="${cpu/CPU\ Type\:/}" + + speed="$(system_profiler SPHardwareDataTypes | grep CPU\ Speed)" + speed="${speed/CPU\ Speed\:/}" + + cores="$(system_profiler SPHardwareDataType | grep Number\ Of\ CPUs)" + cores="${cores/Number\ Of\ CPUs\:/}" else cpu="$(sysctl -n machdep.cpu.brand_string)" fi From 2a6ca41dcf51a5781714ef63f30ee166f9039934 Mon Sep 17 00:00:00 2001 From: Aaron Blakely Date: Thu, 7 Jul 2022 03:07:59 -0500 Subject: [PATCH 3/4] fixed memory usage reading --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index 00c26d5a..b2e145a8 100755 --- a/neofetch +++ b/neofetch @@ -2731,6 +2731,11 @@ get_memory() { mem_used="${mem_used/Pages active\: /}" mem_used="${mem_used/\./}" + pages_inactive=$(vm_stat | grep "Pages inactive") + pages_inactive=${pages_inactive/Pages inactive\: /} + pages_inactive=${pages_inactive/\./} + + mem_used=$((mem_used + pages_inactive)) mem_used=$((mem_used * 4096 / 1048576)) else hw_pagesize="$(sysctl -n hw.pagesize)" From 36cc71b08e04ea5a894487a38464efab2e3d4bbb Mon Sep 17 00:00:00 2001 From: Aaron Blakely Date: Thu, 7 Jul 2022 18:44:51 -0500 Subject: [PATCH 4/4] enabled OS X 10.5 leopard support --- neofetch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index b2e145a8..65db4470 100755 --- a/neofetch +++ b/neofetch @@ -1260,7 +1260,7 @@ get_model() { if [[ $(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC") != "" ]]; then model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" else - if [[ $osx_version =~ "10.4" ]]; then + if [[ $osx_version =~ "10.4" || $osx_version =~ "10.5" ]]; then model="$(system_profiler SPHardwareDataType | grep Machine\ Name\:)" model=${model/Machine\ Name\:/} @@ -2289,12 +2289,14 @@ get_cpu() { ;; "Mac OS X"|"macOS") - if [[ $osx_version =~ "10.4" ]]; then + if [[ $osx_version =~ "10.4" || $osx_version =~ "10.5" ]]; then cpu="$(system_profiler SPHardwareDataType | grep CPU\ Type)" cpu="${cpu/CPU\ Type\:/}" - speed="$(system_profiler SPHardwareDataTypes | grep CPU\ Speed)" + speed="$(system_profiler SPHardwareDataType | grep CPU\ Speed)" speed="${speed/CPU\ Speed\:/}" + speed="${speed/ MHz/}" + speed="${speed/ GHz/}" cores="$(system_profiler SPHardwareDataType | grep Number\ Of\ CPUs)" cores="${cores/Number\ Of\ CPUs\:/}" @@ -2722,7 +2724,7 @@ get_memory() { ;; "Mac OS X" | "macOS" | "iPhone OS") - if [[ $osx_version =~ "10.4" ]]; then + if [[ $osx_version =~ "10.4" || $osx_version =~ "10.5" ]]; then mem_total="$(system_profiler SPHardwareDataType | grep Memory:)" mem_total="${mem_total/Memory\: /}" mem_total="${mem_total/ MB/}"