From d0689271dcee1aa97c6ca91336d2e271b5a20343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Sat, 12 Oct 2019 03:36:55 +0200 Subject: [PATCH] OpenBSD disk fix and kernel improvement --- screenfetch-dev | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index 4562109..98c4614 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -1271,7 +1271,7 @@ detecthost () { # Kernel Version Detection - Begin detectkernel () { if [[ "$distro" == "OpenBSD" ]]; then - kernel=$(sysctl kern.version|awk -F'[ =:]' 'NR==1{print $3" "$4" "$5}') + kernel=$(uname -a | cut -f 3- -d ' ') else # compatibility for older versions of OS X: kernel=$(uname -m && uname -sr) @@ -1702,8 +1702,12 @@ DetectIntelGPU() { detectdisk () { diskusage="Unknown" if type -p df >/dev/null 2>&1; then - if [[ "${distro}" =~ (Free|Net|Open|DragonFly)BSD ]]; then + if [[ "${distro}" =~ (Free|Net|DragonFly)BSD ]]; then totaldisk=$(df -h -c 2>/dev/null | tail -1) + elif [[ "${distro}" == "OpenBSD" ]]; then + totaldisk=$(df -Pk 2> /dev/null | awk ' + /^\// {total+=$2; used+=$3; avail+=$4} + END{printf("total %.1fG %.1fG %.1fG %d%%\n", total/1048576, used/1048576, avail/1048576, used*100/total)}') elif [[ "${distro}" == "Mac OS X" ]]; then totaldisk=$(df -H / 2>/dev/null | tail -1) else