pruned calendar files,

added when files.

1 files changed, 5 insertions, 8 deletions

diff --git a/.zlogin b/.zlogin
index 5e9d536..a70e425 100644
--- a/.zlogin
+++ b/.zlogin
@@ -1,14 +1,11 @@
 
-cmd_exists calendar && (\
 #for _col in {1..$COLUMNS} ; do echo -n "_" ; done ;\ echo;\
-echo "--------------------------------------------------[ événements ]---" ;\
-( calendar -A0 -f all ; calendar -A0 -f ~/.calendar/calendar ) | sed "s/\(\*.*\)/\1/;s/\(\*.*\*\)/\1/" ;\
-)
+echo "--------------------------------------------------[ événements ]---" ;
+cmd_exists when && when w --calendar=~/.when/birthdays
+cmd_exists calendar && calendar -A0 | sed "s/\(\*.*\)/\1/;s/\(\*.*\*\)/\1/" ;\
 
-[ -x ~/sbin//calendrier ] && ( \
-echo "--------------------------------------------------[ calendrier ]---" ;\
-~/sbin/calendrier \
-)
+echo "--------------------------------------------------[ calendrier ]---" ;
+[ -x ~/sbin//calendrier ] && ~/sbin/calendrier
 
 #cmd_exists remind && remind -n
 #