From f855ae243217ac18ee7bad017818aea0810ea91d Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sun, 12 Jun 2016 11:06:35 +1000
Subject: [PATCH] Move all whitespace trimming to an external function

---
 neofetch | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/neofetch b/neofetch
index 34f29b4b..683581aa 100755
--- a/neofetch
+++ b/neofetch
@@ -480,7 +480,6 @@ getdistro () {
         "Linux" )
             if type -p lsb_release >/dev/null 2>&1; then
                 distro="$(lsb_release -d 2>/dev/null | awk -F ':' '/Description/ {printf $2}')"
-                distro=${distro/[[:space:]]}
 
             elif type -p crux >/dev/null 2>&1; then
                 distro="$(crux)"
@@ -533,12 +532,9 @@ getdistro () {
 
             # Strip crap from the output of wmic
             distro=${distro/Caption'='}
-            distro=${distro//[[:space:]]/ }
-            distro=${distro//  }
             distro=${distro/Microsoft }
         ;;
     esac
-    distro="${distro%"${distro##*[![:space:]]}"}"
 
     # Get architecture
     [ "$os_arch" == "on" ] && \
@@ -646,7 +642,6 @@ getuptime () {
             uptime=${uptime/minutes/mins}
             uptime=${uptime/minute/min}
             uptime=${uptime/seconds/secs}
-            uptime=${uptime# }
         ;;
 
         "tiny")
@@ -659,10 +654,8 @@ getuptime () {
             uptime=${uptime/ minute/m}
             uptime=${uptime/ seconds/s}
             uptime=${uptime/,}
-            uptime=${uptime# }
         ;;
     esac
-    uptime=${uptime//+( )/ }
 }
 
 # }}}
@@ -743,7 +736,6 @@ getpackages () {
                 packages=$((packages+=$(ls -1 /cygdrive/c/ProgramData/chocolatey/lib | wc -l)))
         ;;
     esac
-    packages=${packages// }
 }
 
 # }}}
@@ -784,8 +776,6 @@ getshell () {
                 shell+="$("$SHELL" -c 'printf "%s" "$FISH_VERSION"')"
             ;;
         esac
-
-        shell="${shell/\(*\)}"
     fi
 }
 
@@ -1180,9 +1170,6 @@ getcpu () {
         ;;
     esac
 
-    # Trim whitespace
-    cpu=${cpu//+( )/ }
-
     [ ! -z "$cpu" ] && prin "$subtitle" "$cpu"
 
     if [ "$cpu_display" != "off" ]; then
@@ -1219,7 +1206,6 @@ getgpu () {
             count="$(printf "%s" "$gpu" | uniq -c)"
             count=${count/ VGA*}
             count=${count/ 3D*}
-            count=${count//[[:space:]]}
 
             # If there's more than one gpu
             # Display the count.
@@ -1366,8 +1352,6 @@ getgpu () {
         "Windows")
             gpu=$(wmic path Win32_VideoController get caption /value)
             gpu=${gpu/Caption'='}
-            gpu=${gpu//[[:space:]]/ }
-            gpu=${gpu//  }
         ;;
     esac
 
@@ -1393,7 +1377,6 @@ getgpu () {
         ;;
     esac
 
-    gpu=${gpu//+( )/ }
     gpu="${gpu}${count}"
 }
 
@@ -1560,11 +1543,9 @@ getresolution () {
         "Windows")
             width=$(wmic path Win32_VideoController get CurrentHorizontalResolution /value 2>/dev/null)
             width=${width/CurrentHorizontalResolution'='/}
-            width=${width//[[:space:]]}
 
             height=$(wmic path Win32_VideoController get CurrentVerticalResolution /value 2>/dev/null)
             height=${height/CurrentVerticalResolution'='/}
-            height=${height//[[:space:]]}
 
             [ ! -z "$width" ] && \
                 resolution="${width}x${height}"
@@ -1693,7 +1674,6 @@ getstyle () {
 
             gtk3theme=${gtk3theme/${name}*=}
             gtk3theme=${gtk3theme//\"}
-            gtk3theme=${gtk3theme/[[:space:]]/ }
         fi
 
         # Uppercase the first letter of each gtk theme
@@ -1723,7 +1703,6 @@ getstyle () {
         theme="${gtk2theme}${gtk3theme}"
         theme=${theme//\"}
         theme=${theme//\'}
-        theme=${theme//  / }
 
         # Make the output shorter by removing "[GTKX]" from the string
         if [ "$gtk_shorthand" == "on" ]; then
@@ -1958,8 +1937,6 @@ getbattery () {
         "Windows")
             battery="$(wmic Path Win32_Battery get EstimatedChargeRemaining /value)"
             battery=${battery/EstimatedChargeRemaining'='}
-            battery=${battery//[[:space:]]/ }
-            battery=${battery// }
             [ ! -z "$battery" ] && \
                 battery+="%"
         ;;
@@ -2496,6 +2473,9 @@ info () {
     # If the output is empty, don't print anything
     [ -z "$output" ] && return
 
+    # Trim whitespace
+    output="$(trim "$output")"
+
     case "$1" in
         title)
             string="${title_color}${bold}${output}"
@@ -2536,6 +2516,9 @@ prin () {
         length=$((${#subtitle} +  ${#2} + 1))
     fi
 
+    # Trim whitespace
+    string="$(trim "$string")"
+
     # Print the info
     printf "%b%s\n" "${padding}${string}\033[0m"
 }
@@ -2803,6 +2786,16 @@ getlinebreak () {
 
 # }}}
 
+# Trim whitespace {{{
+
+trim() {
+    set -f
+    builtin echo -E $1
+    set +f
+}
+
+# }}}
+
 
 # }}}