From a9af270b9635762a01e7b4cd1074dd7d16c84433 Mon Sep 17 00:00:00 2001
From: Crestwave <crest.wave@yahoo.com>
Date: Mon, 30 Sep 2019 11:10:00 +0800
Subject: [PATCH 1/2] pfetch: initial solaris support

---
 pfetch | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/pfetch b/pfetch
index e9e35e1..2e7074c 100755
--- a/pfetch
+++ b/pfetch
@@ -100,8 +100,8 @@ log() {
 
 get_title() {
     # Username is retrieved by first checking '$USER' with a fallback
-    # to the 'whoami' command.
-    user=${USER:-$(whoami)}
+    # to the 'id -un' command.
+    user=${USER:-$(id -un)}
 
     # Hostname is retrieved by first checking '$HOSTNAME' with a fallback
     # to the 'hostname' command.
@@ -246,6 +246,10 @@ get_os() {
             trap '' EXIT
         ;;
 
+        SunOS)
+            IFS='(' read -r distro _ < /etc/release
+        ;;
+
         *)
             # Catch all to ensure '$distro' is never blank.
             # This also handles the BSDs.
@@ -367,6 +371,12 @@ get_uptime() {
             # regular seconds.
             s=$(($(system_time) / 1000000))
         ;;
+
+        SunOS)
+            IFS='	.' read -r _ s _ <<-EOF
+				$(kstat -p unix:0:system_misc:snaptime)
+			EOF
+        ;;
     esac
 
     # Convert the uptime from seconds into days, hours and minutes.
@@ -456,6 +466,11 @@ get_pkgs() {
             Minix)
                 printf '%s\n' /usr/pkg/var/db/pkg/*/
             ;;
+
+            SunOS)
+                has pkginfo    && pkginfo -i
+                has pkg        && pkg list
+            ;;
         esac | wc -l
     `
 
@@ -612,6 +627,21 @@ get_memory() {
             mem_used=$(((mem_full - mem_free) / 1024))
             mem_full=$(( mem_full / 1024))
         ;;
+
+        SunOS)
+            hw_pagesize=$(pagesize)
+
+            while read -r _ p; do
+                : "${pages_total:+"${pages_free="$p"}"}" "${pages_total="$p"}"
+            done <<-EOF
+				$(kstat -p unix:0:system_pages:pagestotal \
+                           unix:0:system_pages:pagesfree)
+			EOF
+
+            mem_full=$((pages_total * hw_pagesize / 1024 / 1024))
+            mem_free=$((pages_free * hw_pagesize / 1024 / 1024))
+            mem_used=$((mem_full - mem_free))
+        ;;
     esac
 
     log memory "${mem_used:-?}M / ${mem_full:-?}M" >&6

From 02a9bd84afa00c6ffde9f7297a533b30476b608b Mon Sep 17 00:00:00 2001
From: Crestwave <crest.wave@yahoo.com>
Date: Mon, 30 Sep 2019 15:32:54 +0800
Subject: [PATCH 2/2] pfetch: code style changes

---
 pfetch | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pfetch b/pfetch
index 2e7074c..ae8a682 100755
--- a/pfetch
+++ b/pfetch
@@ -468,8 +468,8 @@ get_pkgs() {
             ;;
 
             SunOS)
-                has pkginfo    && pkginfo -i
-                has pkg        && pkg list
+                has pkginfo && pkginfo -i
+                has pkg     && pkg list
             ;;
         esac | wc -l
     `
@@ -631,8 +631,11 @@ get_memory() {
         SunOS)
             hw_pagesize=$(pagesize)
 
-            while read -r _ p; do
-                : "${pages_total:+"${pages_free="$p"}"}" "${pages_total="$p"}"
+            while read -r key val; do
+                case $key in
+                    *total) pages_total=$val ;;
+                    *free)  pages_free=$val ;;
+                esac
             done <<-EOF
 				$(kstat -p unix:0:system_pages:pagestotal \
                            unix:0:system_pages:pagesfree)