From 0dc1c3460dc4c86ec1bfe8ab273775525e851fe5 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 1 Sep 2016 13:56:42 +1200
Subject: Refactor welcome.sh

---
 sh/profile.d/welcome.sh | 67 +++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 38 deletions(-)

(limited to 'sh/profile.d')

diff --git a/sh/profile.d/welcome.sh b/sh/profile.d/welcome.sh
index 26bf678f..ede7a05f 100644
--- a/sh/profile.d/welcome.sh
+++ b/sh/profile.d/welcome.sh
@@ -10,45 +10,36 @@ esac
 # Not if ~/.hushlogin exists
 [ -e "$HOME"/.hushlogin ] && return
 
+# Run all of this in a subshell to clear it away afterwards
 (
-    # Only if ~/.welcome/fortune exists
-    [ -e "$HOME"/.welcome/fortune ] || exit
-
-    # Only if fortune(6) available
-    command -v fortune >/dev/null 2>&1 || exit
+    # Temporary helper function
+    welcome() {
+        [ -e "$HOME"/.welcome/"$1" ] || return
+        command -v "$1" >/dev/null 2>&1 || return
+    }
 
     # Show a fortune
-    [ -d "$HOME"/.local/share/games/fortunes ] &&
-        : "${FORTUNE_PATH:="$HOME"/.local/share/games/fortunes}"
-    fortune -s "$FORTUNE_PATH"
-    printf '\n'
-)
-(
-    # Only if ~/.welcome/remind exists
-    [ -e "$HOME"/.welcome/remind ] || exit
-
-    # Only if rem(1) available
-    command -v rem >/dev/null 2>&1 || exit
-
-    # Print reminders with asterisks
-    rem -hq | sed 's/^/* /'
-    printf '\n'
-)
-(
-    # Only if ~/.welcome/remind verse
-    [ -e "$HOME"/.welcome/verse ] || exit
-
-    # Only if verse(1) available
-    command -v verse >/dev/null 2>&1 || exit
-
-    # Run verse(1) if we haven't seen it already today (the verses are selected
-    # by date); run in a subshell to keep vars out of global namespace
-    now=$(date +%Y%m%d)
-    last=0
-    [ -f "$HOME"/.verse ] &&
-        last=$(cat -- "$HOME"/.verse)
-    [ "$now" -gt "$last" ] || exit
-    verse
-    printf '\n'
-    printf '%s\n' "$now" > "$HOME"/.verse
+    if welcome fortune ; then
+        [ -d "$HOME"/.local/share/games/fortunes ] &&
+            : "${FORTUNE_PATH:="$HOME"/.local/share/games/fortunes}"
+        fortune -s "$FORTUNE_PATH"
+        printf '\n'
+    fi
+
+    # Print today's reminders with asterisks
+    if welcome rem ; then
+        rem -hq | sed 's/^/* /'
+        printf '\n'
+    fi
+
+    # Run verse(1) if we haven't seen it already today
+    if welcome verse ; then
+        [ -f "$HOME"/.verse ] && read -r last <"$HOME"/.verse
+        now=$(date +%Y%m%d)
+        if [ "$now" -gt "${last:-0}" ] ; then
+            verse
+            printf '\n'
+            printf '%s\n' "$now" >"$HOME"/.verse
+        fi
+    fi
 )
-- 
cgit v1.2.3