From a5cc977f4f87fef54ad482d726c158c6074b8e9d Mon Sep 17 00:00:00 2001
From: sevi-kun <bela.richartz@thurweb.ch>
Date: Fri, 16 Jul 2021 03:25:59 +0200
Subject: [PATCH] Cleaned up code.

---
 motd.sh | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/motd.sh b/motd.sh
index 18bb978..a13071f 100755
--- a/motd.sh
+++ b/motd.sh
@@ -1,13 +1,16 @@
 # Fancy waifu motd
 
-WAIFUS=52                             # count of waifus
-RESOLUTION=128                        # resolution of waifu
+MOTDPATH="/usr/share/motd"            # path to motd folder
 CACHEFILE="$HOME/.cache/waifu"        # to cache waifu state
-MINTERMWIDTH=200                      # minimal width of term, to display motd
+RESOLUTION=256                        # resolution of waifu
 CENTER=true                           # center motd?
-LOLCAT=false                          # use lolcat?
+LOLCAT=true                           # use lolcat?
 UNAMEARG="-sr"                        # uname arguments
 UPTIMEARG="--pretty"                  # uptime arguments
+tput_cols=$(/usr/bin/tput cols)       # terminal columns
+MINTERMWIDTH=200                      # minimal width of term, to display motd
+
+WAIFUS=$(($(ls $MOTDPATH/waifus/*.256.png | wc -w) - 1))   # count of waifus
 
 output() {
   val=0
@@ -16,33 +19,33 @@ output() {
   if [ -f "/usr/games/lolcat" ]; then lx="/usr/games/lolcat"; else lx="/usr/bin/lolcat"; fi
   case "$val" in
     0)
-      /bin/cat /usr/share/motd/motd 
+      /bin/cat $MOTDPATH/motd 
       uname $UNAMEARG 
       uptime $UPTIMEARG
       ;;
 
     1)
-      /bin/cat /usr/share/motd/motd | $lx
+      /bin/cat $MOTDPATH/motd | $lx
       uname $UNAMEARG | $lx
       uptime $UPTIMEARG | $lx
       ;;
 
     2)
-      /bin/cat /usr/share/motd/motd | awk '{ z = '$(tput cols)' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }'
-      uname $UNAMEARG | awk '{ z = '$(tput cols)' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }'
-      uptime $UPTIMEARG | awk '{ z = '$(tput cols)' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }'
+      /bin/cat $MOTDPATH/motd | awk '{ z = '$tput_cols' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }'
+      uname $UNAMEARG | awk '{ z = '$tput_cols' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }'
+      uptime $UPTIMEARG | awk '{ z = '$tput_cols' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }'
       ;;
 
     3)
-      /bin/cat /usr/share/motd/motd | awk '{ z = '$(tput cols)' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }' | $lx
-      uname $UNAMEARG | awk '{ z = '$(tput cols)' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }' | $lx
-      uptime $UPTIMEARG | awk '{ z = '$(tput cols)' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }' | $lx
+      /bin/cat $MOTDPATH/motd | awk '{ z = '$tput_cols' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }' | $lx
+      uname $UNAMEARG | awk '{ z = '$tput_cols' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }' | $lx
+      uptime $UPTIMEARG | awk '{ z = '$tput_cols' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }' | $lx
       ;;
   esac
 }
 
 
-if [ $(tput cols) -gt $MINTERMWIDTH ]
+if [ $tput_cols -gt $MINTERMWIDTH ]
 then
   if [ $TERM == "xterm-kitty" ]
   then
@@ -63,9 +66,9 @@ then
       else
         echo $(($WAIFU + 1)) > $CACHEFILE
       fi
-      if $CENTER; then kitty +kitten icat "/usr/share/motd/waifus/waifu-$WAIFU.$RESOLUTION.png"; else kitty +kitten icat --align left "/usr/share/motd/waifus/waifu-$WAIFU.$RESOLUTION.png"; fi
+      if $CENTER; then kitty +kitten icat "$MOTDPATH/waifus/waifu-$WAIFU.$RESOLUTION.png"; else kitty +kitten icat --align left "$MOTDPATH/waifus/waifu-$WAIFU.$RESOLUTION.png"; fi
     else
-      if $CENTER; then kitty +kitten icat "/usr/share/motd/waifus/waifu-$((0 + RANDOM % $WAIFUS)).$RESOLUTION.png"; else kitty +kitten icat --align left "/usr/share/motd/waifus/waifu-$((0 + RANDOM % $WAIFUS)).$RESOLUTION.png"; fi
+      if $CENTER; then kitty +kitten icat "$MOTDPATH/waifus/waifu-$((0 + RANDOM % $WAIFUS)).$RESOLUTION.png"; else kitty +kitten icat --align left "$MOTDPATH/waifus/waifu-$((0 + RANDOM % $WAIFUS)).$RESOLUTION.png"; fi
     fi
   fi
   output $LOLCAT $CENTER