From 4a2cace9d69e79a2fde481e646068aa44ef33153 Mon Sep 17 00:00:00 2001 From: Jason Helfman Date: Sat, 26 Jun 2021 07:43:55 +0000 Subject: [PATCH 1/4] - pkg call fails as /usr/sbin isn't in default path, call explicit path - use freebsd-version in favor of uname, shift to "Running Kernel" --- screenfetch-dev | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index 1da3d9f0..67a825fb 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -1315,6 +1315,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) @@ -1458,7 +1460,7 @@ detectpkgs () { pkgs=$(pkg_info | grep -c .) ;; 'FreeBSD') - pkgs=$(pkg info | grep -c .) + pkgs=$(/usr/sbin/pkg info | grep -c .) ;; 'Cygwin') offset=2 @@ -6379,7 +6381,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 From 4e18d53a60bc362556cbe5367fe26f1586601f76 Mon Sep 17 00:00:00 2001 From: j Date: Sat, 14 May 2022 21:15:37 -0700 Subject: [PATCH 2/4] Update screenfetch-dev - address bug in CPU for FreeBSD --- screenfetch-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screenfetch-dev b/screenfetch-dev index 67a825fb..c72cd592 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -1524,7 +1524,7 @@ detectcpu () { cpu="Unknown" fi elif [ "$distro" == "FreeBSD" ]; then - cpu=$(dmesg | awk -F': ' '/^CPU/ {gsub(/ +/," "); gsub(/\([^\(\)]*\)|CPU /,"", $2); print $2; exit}') + cpu=$(sysctl -n hw.model |sed -e 's/ \{2,\}/ /g') elif [ "$distro" == "DragonFlyBSD" ]; then cpu=$(sysctl -n hw.model) elif [ "$distro" == "OpenBSD" ]; then From b7f311324897b3f1064213d1bc594ce38d9d84aa Mon Sep 17 00:00:00 2001 From: j Date: Tue, 28 Nov 2023 19:35:10 -0800 Subject: [PATCH 3/4] adjust spacing --- screenfetch-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screenfetch-dev b/screenfetch-dev index 654603f6..d1c8522e 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -1550,7 +1550,7 @@ detectcpu () { cpu="Unknown" fi elif [ "$distro" == "FreeBSD" || "$distro" == "DragonFlyBSD" ]; then - cpu=$(sysctl -n hw.model) + cpu=$(sysctl -n hw.model) elif [ "$distro" == "OpenBSD" ]; then cpu=$(sysctl -n hw.model | sed 's/@.*//') elif [ "$distro" == "Haiku" ]; then From 06cfd135473060888b3c19eeb394c5d89736dfe0 Mon Sep 17 00:00:00 2001 From: j Date: Tue, 28 Nov 2023 19:44:02 -0800 Subject: [PATCH 4/4] adjust syntax for combined test --- screenfetch-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screenfetch-dev b/screenfetch-dev index d1c8522e..ac5f2933 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -1549,7 +1549,7 @@ detectcpu () { else cpu="Unknown" fi - elif [ "$distro" == "FreeBSD" || "$distro" == "DragonFlyBSD" ]; then + elif [[ "$distro" == "FreeBSD" || "$distro" == "DragonFlyBSD" ]]; then cpu=$(sysctl -n hw.model) elif [ "$distro" == "OpenBSD" ]; then cpu=$(sysctl -n hw.model | sed 's/@.*//')