From c0fb89ce406f6bc3ba5ec997bfe94b0091b0df77 Mon Sep 17 00:00:00 2001
From: Muhammad Herdiansyah <herdiansyah@openmailbox.org>
Date: Sat, 10 Jun 2017 00:54:50 +0700
Subject: [PATCH] Distro: Refactor $machine_arch

---
 neofetch | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/neofetch b/neofetch
index d9427bb5..95b59cbe 100755
--- a/neofetch
+++ b/neofetch
@@ -216,8 +216,14 @@ get_distro() {
     [[ -z "$distro" ]] && distro="$os (Unknown)"
 
     # Get OS architecture.
-    [[ "$os_arch" == "on" ]] && \
+    if [[ "$os_arch" == "on" ]]; then
+        case "$os" in
+            "Solaris" | "AIX" | "BSD" | "macOS") machine_arch="$(uname -p)" ;;
+            *) machine_arch="$(uname -m)" ;;
+
+        esac
         distro+=" ${machine_arch}"
+    fi
 
     [[ "${ascii_distro:-auto}" == "auto" ]] && \
         ascii_distro="$(trim "$distro")"
@@ -3772,11 +3778,10 @@ old_options() {
 cache_uname() {
     # Cache the output of uname so we don't
     # have to spawn it multiple times.
-    uname=($(uname -srm))
+    uname=($(uname -sr))
 
     kernel_name="${uname[0]}"
     kernel_version="${uname[1]}"
-    machine_arch="${uname[2]}"
 }
 
 convert_time() {