From 943a5493c39c305ff00c71038706a4752f48513c Mon Sep 17 00:00:00 2001
From: Dylan <dyl@tfwno.gf>
Date: Sat, 6 Feb 2016 10:21:12 +1100
Subject: [PATCH] Stdout mode: Replace the printinfo function instead of
 disabling it.

---
 fetch | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/fetch b/fetch
index 1edddc15..db9de29c 100755
--- a/fetch
+++ b/fetch
@@ -1825,7 +1825,7 @@ info () {
 
         # Unset the vars containg escape codes as lemonbar doesn't
         # support them.
-        unset bold subtitle_color clear colon_color info_color \
+        unset -v bold subtitle_color clear colon_color info_color \
         underline_color title_color at_color
 
         # Show/Hide subtitles
@@ -1873,19 +1873,21 @@ prin () {
 # Stdout {{{
 
 stdout () {
-    index=1
-    for func in "${args[@]}"; do
+    printinfo () {
+        index=1
+        for func in "${args[@]}"; do
 
-        case "$func" in
-            "--stdout") continue ;;
-            "--"*) break ;;
-            *)
-                case "${args[$((index + 1))]}" in "--"*) unset stdout_seperator ;; esac
-                info "$func"
-            ;;
-        esac
-        index=$((index + 1))
-    done
+            case "$func" in
+                "--stdout") continue ;;
+                "--"*) break ;;
+                *)
+                    case "${args[$((index + 1))]}" in "--"*) unset stdout_seperator ;; esac
+                    info "$func"
+                ;;
+            esac
+            index=$((index + 1))
+        done
+    }
 }
 
 # }}}
@@ -2212,13 +2214,12 @@ while [ "$1" ]; do
         --stdout)
             case "$2" in
                 "--"* | "") stdout="on" ;;
-                *) stdout="on"; stdout_args="on" ;;
+                *) stdout="on"; stdout_args="on"; args=("$@"); stdout ;;
             esac
 
-            unset info_color
+            unset info_color colors
             image="off"
             color_blocks="off"
-            args=("$@")
         ;;
 
         # Other
@@ -2284,16 +2285,12 @@ fi
 # Move cursor to the top
 [ "$image" != "off" ] && printf "\033[0H"
 
-if [ "$stdout_args" == "on" ]; then
-    stdout
-else
-    # Get colors / bold
-    colors
-    bold
+# Get colors / bold
+colors 2>/dev/null
+bold
 
-    # Print the info
-    printinfo
-fi
+# Print the info
+printinfo
 
 if [ "$image" != "off" ]; then
     # Get cursor position