From dc5c7a0d0a98d88877555e7e32556c97a7e463a6 Mon Sep 17 00:00:00 2001 From: Jason Helfman Date: Thu, 30 Nov 2023 22:13:24 -0800 Subject: [PATCH] - adjust detections and kernel for FreeBSD --- screenfetch-dev | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index a8b9451b..ac5f2933 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -1337,6 +1337,8 @@ detecthost () { detectkernel () { if [[ "$distro" == "OpenBSD" ]]; then kernel=$(uname -a | cut -f 3- -d ' ') + elif [[ "$distro" == "FreeBSD" ]]; then + kernel=$(freebsd-version -r) else # compatibility for older versions of OS X: kernel=$(uname -m && uname -sr) @@ -1484,7 +1486,7 @@ detectpkgs () { pkgs=$(pkg_info | grep -c .) ;; 'FreeBSD') - pkgs=$(pkg info | grep -c .) + pkgs=$(/usr/sbin/pkg info | grep -c .) ;; 'Cygwin') offset=2 @@ -1547,10 +1549,8 @@ detectcpu () { else cpu="Unknown" fi - elif [ "$distro" == "FreeBSD" ]; then - cpu=$(dmesg | "${AWK}" -F': ' '/^CPU/ {gsub(/ +/," "); gsub(/\([^\(\)]*\)|CPU /,"", $2); print $2; exit}') - elif [ "$distro" == "DragonFlyBSD" ]; then - cpu=$(sysctl -n hw.model) + elif [[ "$distro" == "FreeBSD" || "$distro" == "DragonFlyBSD" ]]; then + cpu=$(sysctl -n hw.model) elif [ "$distro" == "OpenBSD" ]; then cpu=$(sysctl -n hw.model | sed 's/@.*//') elif [ "$distro" == "Haiku" ]; then @@ -6427,7 +6427,11 @@ infoDisplay () { ((display_index++)) fi if [[ "${display[@]}" =~ "kernel" ]]; then - mykernel=$(echo -e "$labelcolor Kernel:$textcolor $kernel") + if [[ "$distro" == "FreeBSD" ]]; then + mykernel=$(echo -e "$labelcolor Running Kernel:$textcolor $kernel") + else + mykernel=$(echo -e "$labelcolor Kernel:$textcolor $kernel") + fi out_array=( "${out_array[@]}" "$mykernel" ) ((display_index++)) fi