From ec1705835c18e0d42fefe96df285678c8da52970 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sat, 28 May 2016 10:27:58 +1000
Subject: [PATCH] Revert last two commits

---
 neofetch | 52 +++++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/neofetch b/neofetch
index 9053a61e..9cefba0e 100755
--- a/neofetch
+++ b/neofetch
@@ -1739,35 +1739,37 @@ getfont () {
 # Terminal Emulator {{{
 
 getterm () {
+    # Workaround for OS X systems that
+    # don't support the block below.
+    case "$TERM_PROGRAM" in
+        "iTerm.app") term="iTerm2" ;;
+        "Terminal.app") term="Apple Terminal" ;;
+        *) term="${TERM_PROGRAM/\.app}" ;;
+    esac
+
     # Check $PPID for terminal emulator.
-    case "$os" in
-        "Mac OS X")
-            case "$TERM_PROGRAM" in
-                "iTerm.app") term="iTerm2" ;;
-                "Terminal.app") term="Apple Terminal" ;;
-                *) term="${TERM_PROGRAM/\.app}" ;;
-            esac
-        ;;
+    if [ -z "$term" ]; then
+        case "$os" in
+            "Windows")
+                parent="$(ps -p ${1:-$PPID} | awk '{printf $2}')"
+                parent=${parent/'PPID'}
 
-        "Windows")
-            parent="$(ps -p ${1:-$PPID} | awk '{printf $2}')"
-            parent=${parent/'PPID'}
+                name="$(ps -p $parent | awk '{printf $8}')"
+                name=${name/'COMMAND'}
+                name=${name/*\/}
+            ;;
 
-            name="$(ps -p $parent | awk '{printf $8}')"
-            name=${name/'COMMAND'}
-            name=${name/*\/}
-        ;;
+            *)
+                parent="$(ps -p ${1:-$PPID} -o ppid=)"
+                name="$(ps -p $parent -o comm=)"
+            ;;
+        esac
 
-        *)
-            parent="$(ps -p ${1:-$PPID} -o ppid=)"
-            name="$(ps -p $parent -o comm=)"
-        ;;
-    esac
-
-    case "$name" in
-        "${SHELL/*\/}" | *"sh" | "tmux" | "screen" | "systemd") getterm "$parent" ;;
-        *) term="$name" ;;
-    esac
+        case "$name" in
+            "${SHELL/*\/}" | *"sh" | "tmux" | "screen" | "systemd") getterm "$parent" ;;
+            *) term="$name" ;;
+        esac
+    fi
 }
 
 # }}}