From 5ec6e51a76489071642b38fd984c55f9d27177ec Mon Sep 17 00:00:00 2001 From: darealshinji Date: Wed, 18 Nov 2015 22:35:10 +0100 Subject: [PATCH 1/3] NetBSD package count --- screenfetch-dev | 3 +++ 1 file changed, 3 insertions(+) diff --git a/screenfetch-dev b/screenfetch-dev index 729a234e..203703f6 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -918,6 +918,9 @@ detectpkgs () { pkgs=$(if TMPDIR=/dev/null ASSUME_ALWAYS_YES=1 PACKAGESITE=file:///nonexistent pkg info pkg >/dev/null 2>&1; then pkg info | wc -l | awk '{print $1}'; else pkg_info | wc -l | awk '{sub(" ", "");print $1}'; fi) ;; + 'NetBSD') + pkgs=$(pkg_info | wc -l | tr -d ' ') + ;; 'Cygwin') cygfix=2 pkgs=$(($(cygcheck -cd | wc -l) - ${cygfix})) From 9b1441aa568af5e3f695a5875fa023f21aaf6063 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Wed, 18 Nov 2015 22:49:18 +0100 Subject: [PATCH 2/3] NetBSD shell detection --- screenfetch-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screenfetch-dev b/screenfetch-dev index 203703f6..8e6cdc3d 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -1226,7 +1226,7 @@ detectshell () { else if [[ "${OSTYPE}" == "linux-gnu" || "${OSTYPE}" == "linux" ]]; then shell_type=$(ps -p $PPID -o cmd --no-heading) - elif [[ "${distro}" == "Mac OS X" || "${distro}" == "FreeBSD" || "${distro}" == "OpenBSD" ]]; then + elif [[ "${distro}" == "Mac OS X" || "${distro}" == "FreeBSD" || "${distro}" == "OpenBSD" || "${distro}" == "NetBSD" ]]; then shell_type=$(ps -p $PPID -o args | tail -1) else shell_type=$(ps -p $(ps -p $PPID | awk '$1 !~ /PID/ {print $1}') | awk 'FNR>1 {print $1}') From 7c6ca01228b8be37173dee32ed745d599584466a Mon Sep 17 00:00:00 2001 From: darealshinji Date: Wed, 18 Nov 2015 23:16:52 +0100 Subject: [PATCH 3/3] cpu detection: not all seds support \n Fixes CPU GHz listed twice on NetBSD. --- screenfetch-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screenfetch-dev b/screenfetch-dev index 8e6cdc3d..45369a51 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -983,7 +983,7 @@ detectcpu () { fi fi else - cpu=$(awk 'BEGIN{FS=":"} /model name/ { print $2; exit }' /proc/cpuinfo | sed 's/ @/\n/' | head -1) + cpu=$(awk 'BEGIN{FS=":"} /model name/ { print $2; exit }' /proc/cpuinfo | awk 'BEGIN{FS=" @"; OFS="\n"} { print $1; exit }') cpun=$(grep "physical id" /proc/cpuinfo | sort | uniq | wc -l) if [ -z "$cpu" ]; then cpu=$(awk 'BEGIN{FS=":"} /Hardware/ { print $2; exit }' /proc/cpuinfo)