From 642d0ca70ec6d9a92223413e528a0e7fae373f99 Mon Sep 17 00:00:00 2001
From: jsch <me@schil.li>
Date: Mon, 26 Jan 2015 20:37:05 -0600
Subject: [PATCH] update to new 'rendering method'

---
 ufetch | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/ufetch b/ufetch
index aa28045..c0403a9 100755
--- a/ufetch
+++ b/ufetch
@@ -11,12 +11,11 @@ OS="CRUX 3.1"
 KERNEL=$(uname -rs)
 PACKAGES=$(pkginfo -i | wc -l)
 # shell is already defined
-WM="spectrwm"
+WM=$(tail -n 1 "$HOME/.xinitrc" | cut -d " " -f2)
 FONT="Profont 9"
 WEBSITE="driedonionsoup.com"
 
 ## DEFINE COLORS
-# probably don't change these
 
 rc=$(tput sgr0)		# reset
 c0=$(tput setaf 0)	# black
@@ -29,30 +28,17 @@ c6=$(tput setaf 6)	# cyan
 c7=$(tput setaf 7)	# white
 bc=$(tput bold)		# bold
 
-## RESIZE WINDOW
-# ripped from onodera, edit window height and width if desired
-
-if [[ -n "$DISPLAY" ]]; then
-	wmctrl -r :ACTIVE: -e "0,-1,-1,318,156"
-fi
-
 ## OUTPUT
-# good luck
+# todo: make good
 
-printf "\n"
-printf "%s" "$c6      ___    $rc"
-printf "%s\n" "$c6$bc $USER$c7@$c6$HOSTNAME$rc"
-printf "%s" "$c6     ($c7.. $c6|   $rc"
-printf "%s\n" "$c6$bc OS:       $c7$OS$rc"
-printf "%s" "$c6     ($c3<> $c6|   $rc"
-printf "%s\n" "$c6$bc KERNEL:   $c7$KERNEL$rc"
-printf "%s" "$c6    /$c7 __  $c6\  $rc"
-printf "%s\n" "$c6$bc PACKAGES: $c7$PACKAGES$rc"
-printf "%s" "$c6   ( $c7/  \ $c6/| $rc"
-printf "%s\n" "$c6$bc SHELL:    $c7$SHELL$rc"
-printf "%s" "$c3  _$c6/\\$c7 __)$c6/$c3"
-printf "%s" "_$c6) $rc"
-printf "%s\n" "$c6$bc WM:       $c7$WM$rc"
-printf "%s" " $c3 \/$c6-____$c3\/  $rc"
-printf "%s\n" "$c6$bc WEBSITE:  $c7$WEBSITE$rc"
-printf "\n"
+cat <<EOF
+
+      ${c6}___${rc}     ${c6}${bc}${USER}${c7}@${c6}${HOSTNAME}${rc}
+     ${c6}(${c7}.·${rc} ${c6}|${rc}    ${c6}${bc}OS:${rc}       ${c7}${OS}${rc}
+     ${c6}(${c3}<>${rc} ${c6}|${rc}    ${c6}${bc}KERNEL:${rc}   ${c7}${KERNEL}${rc}
+    ${c6}/${rc} ${c7}__${c6}${rc}  ${c6}\\${rc}   ${c6}${bc}PACKAGES:${rc} ${c7}${PACKAGES}${rc}
+   ${c6}(${c7}${rc} ${c7}/${rc}  ${c7}\\${rc} ${c6}/|${rc}  ${c6}${bc}SHELL:${rc}    ${c7}${SHELL}${rc}
+  ${c3}_${c6}/\\${rc} ${c7}__)${c6}/${c3}_${c6})${rc}  ${c6}${bc}WM:${rc}       ${c7}${WM}${rc}
+  ${c3}\/${c6}-____${c3}\/${rc}   ${c6}${bc}WEBSITE:${rc}  ${c7}${WEBSITE}${rc}
+
+EOF