Better TTY logic for zlogin and zlogout

8 years ago · f1123dd68e
2 changed files with 12 additions and 4 deletions
--- a/runcoms/zlogin
+++ b/runcoms/zlogin
@ -14,10 +14,13 @@
				@@ -14,10 +14,13 @@
  fi
 } &!

-# Print a random, hopefully interesting, adage.
-if (( $+commands[fortune] )); then
-  if [[ -t 0 || -t 1 ]]; then
+# Execute code only if STDERR is bound to a TTY.
+[[ -o INTERACTIVE && -t 2 ]] && {
+
+  # Print a random, hopefully interesting, adage.
+  if (( $+commands[fortune] )); then
    fortune -s
    print
  fi
-fi
+
+} >&2
--- a/runcoms/zlogout
+++ b/runcoms/zlogout
@ -5,9 +5,14 @@
				@@ -5,9 +5,14 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #

+# Execute code only if STDERR is bound to a TTY.
+[[ -o INTERACTIVE && -t 2 ]] && {
+
 # Print the message.
 cat <<-EOF

 Thank you. Come again!
  -- Dr. Apu Nahasapeemapetilon
 EOF
+
+} >&2