1 files changed, 7 insertions, 8 deletions

diff --git a/.zlogin b/.zlogin
index 6baebf8..a551157 100644
--- a/.zlogin
+++ b/.zlogin
@@ -1,13 +1,12 @@
 
-for i in {1..$COLUMNS} ; do echo -n "_" ; done
-echo
-
-calendar -A0 | sed "s/^\(......\*.*\)/\1/"
-
-for i in {1..$COLUMNS} ; do echo -n "_" ; done
+[ which calendar ] && \
+for i in {1..$COLUMNS} ; do echo -n "_" ; done \
+echo \
+calendar -A0 | sed "s/^\(......\*.*\)/\1/" \
+for i in {1..$COLUMNS} ; do echo -n "_" ; done \
 echo ""
 
-source $ZDOTDIR/.keychain
-keychain --quiet --stop others --inherit any
+[ -f $ZDOTDIR/.keychain ] && source $ZDOTDIR/.keychain
+[ which keychain ] && keychain --quiet --stop others --inherit any
 #keychain --quiet --quick id_dsa
 #keychain --quiet --quick 593F1F92