.

dotfiles/banner/banner.sh

@@ -33,9 +33,9 @@ else
   LOLCAT="$(command -v lolcat 2>/dev/null || true)"
 fi
 
-# If lolcat missing, fallback to cat (no color)
-if [[ -z "${LOLCAT:-}" ]]; then
-  LOLCAT="cat"
+HAVE_LOLCAT=0
+if [[ -n "${LOLCAT:-}" ]]; then
+  HAVE_LOLCAT=1
 fi
 
 # Punchline source:
@@ -43,16 +43,26 @@ fi
 # - fallback: "Hello"
 PUNCHLINE="Hello"
 if [[ -r /etc/ps1-punchline ]]; then
-  PUNCHLINE="$(cat /etc/ps1-punchline 2>/dev/null || echo "Hello")"
+  PUNCHLINE="$(head -n 1 /etc/ps1-punchline 2>/dev/null || echo "Hello")"
+  PUNCHLINE="${PUNCHLINE%%$'\r'}"
 fi
 
 # Print banner (only if figlet exists)
 if [[ -n "${FIGLET:-}" ]]; then
-  "$FIGLET" "$(hostname)" -c | "$LOLCAT"
-  "$FIGLET" -f digital "$PUNCHLINE" -c | "$LOLCAT"
+  if [[ "$HAVE_LOLCAT" -eq 1 ]]; then
+    "$FIGLET" "$(hostname)" -c | "$LOLCAT"
+    "$FIGLET" -f digital "$PUNCHLINE" -c | "$LOLCAT"
+  else
+    "$FIGLET" "$(hostname)" -c
+    "$FIGLET" -f digital "$PUNCHLINE" -c
+  fi
 fi
 
 # Print sysinfo if available (Linux)
 if [[ -n "${LANDSCAPE:-}" ]]; then
-  "$LANDSCAPE" | "$LOLCAT"
+  if [[ "$HAVE_LOLCAT" -eq 1 ]]; then
+    "$LANDSCAPE" | "$LOLCAT"
+  else
+    "$LANDSCAPE"
+  fi
 fi