MOD: add better compatibility HEAD trunk

1 files changed, 5 insertions, 5 deletions

@@ -9,7 +9,7 @@ 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 2>/dev/null | awk '/all/ {print 100 - $NF"%"}' | tail -n1) # requires mpstat
+UCPU=$(vmstat | awk 'NR==3{print 100 - $17}')
 
 if [ "$1" = "-h" ]; then
     cat <<EOF
@@ -53,9 +53,9 @@ elif command -v xbps-query >/dev/null 2>&1; then
 elif command -v emerge >/dev/null 2>&1; then
     PKGC=$(ls -1 /var/db/pkg 2>/dev/null | wc -l)
     PKGM="portage"
-elif command -v pkg >/dev/null 2>&1; then
-    PKGC=$(pkg info 2>/dev/null | wc -l)
-    PKGM="pkg"
+elif command -v kiss >/dev/null 2>&1; then
+    PKGC=$(kiss l 2>/dev/null | wc -l)
+    PKGM="kiss"
 else
     PKGC="?"
     PKGM="unknown"
@@ -69,7 +69,7 @@ echo "pkgs: ${PKGC} (${PKGM})." >&2
 echo "editor: ${EDITOR}." >&2
 echo "de/wm: ${XDG_CURRENT_DESKTOP:-$DESKTOP_SESSION}." >&2
 echo "term: ${TERM}." >&2
-echo "cpu: ${CPU} ${UCPU}." >&2
+echo "cpu: ${CPU} ${UCPU}%." >&2
 echo "gpu: ${GPU}." >&2
 echo "mem: ${UMEM}MiB/${TMEM}MiB." >&2
 echo "disk: ${UDSK}MiB/${TDSK}MiB." >&2