MOD: large update ish.

1 files changed, 8 insertions, 6 deletions

@@ -1,15 +1,15 @@
 #!/usr/bin/env sh
 
-HOST=$(hostname -s)
+HOST=$(hostname)
 CPU=$(cat /proc/cpuinfo | grep "model name" | head -1 | cut -d':' -f2) 
-GPU=$(lspci | grep -i "vga\|3d\|display" | head -1 | cut -d':' -f3) # requires pciutils
+GPU=$(lspci 2>/dev/null | grep -i "vga\|3d\|display" | head -1 | cut -d':' -f3) # requires pciutils
 TMEM=$(free -m | awk '/^Mem:/{print $2}')
 UMEM=$(free -m | awk '/^Mem:/{print $3}')
-OS=$(cat /etc/os-release | grep "^PRETTY_NAME" | cut -d'"' -f2)
+OS=$(uname -sr)
 KERN=$(uname -r)
 TDSK=$(df -m / | awk 'NR==2{print $2}')
 UDSK=$(df -m / | awk 'NR==2{print $3}')
-UCPU=$(mpstat 1 1 | awk '/all/ {print 100 - $NF"%"}' | tail -n1) # requires mpstat
+UCPU=$(mpstat 1 1 2>/dev/null | awk '/all/ {print 100 - $NF"%"}' | tail -n1) # requires mpstat
 
 if [ "$1" = "-h" ]; then
     cat <<EOF
@@ -32,8 +32,10 @@ EOF
     exit 0
 fi
 
-
-if command -v apk >/dev/null 2>&1; then
+if command -v pkg_add >/dev/null 2>&1; then
+    PKGC=$(pkg_info 2>/dev/null | wc -l | sed 's/      //g')
+    PKGM="pkg"
+elif command -v apk >/dev/null 2>&1; then
     PKGC=$(apk list --installed 2>/dev/null | wc -l)
     PKGM="apk"
 elif command -v pacman >/dev/null 2>&1; then