1 files changed, 9 insertions, 8 deletions

diff --git a/.zlogin b/.zlogin
index 9d4045f..5e9d536 100644
--- a/.zlogin
+++ b/.zlogin
@@ -1,16 +1,17 @@
 
 cmd_exists calendar && (\
 #for _col in {1..$COLUMNS} ; do echo -n "_" ; done ;\ echo;\
-echo "------------------------------[ événements ]---" ;\
-calendar -A0 -f all -f ~/.calendar/calendar		| sed "s/\(\*.*\)/\1/;s/\(\*.*\*\)/\1/" ;\
+echo "--------------------------------------------------[ événements ]---" ;\
+( calendar -A0 -f all ; calendar -A0 -f ~/.calendar/calendar ) | sed "s/\(\*.*\)/\1/;s/\(\*.*\*\)/\1/" ;\
 )
 
+[ -x ~/sbin//calendrier ] && ( \
+echo "--------------------------------------------------[ calendrier ]---" ;\
+~/sbin/calendrier \
+)
+
+#cmd_exists remind && remind -n
+#
 #cmd_exists keychain && keychain --quiet --stop others --inherit any
 #keychain --quiet --quick id_dsa
 #keychain --quiet --quick 593F1F92
-
-#cmd_exists remind && remind -n
-[ -s ~/calendrier_* ] && ( echo "------------------------------[ calendrier ]---" ;\
-grep -v '^#' ~/calendrier_* | sed "s/^\(\*.*\)/\1/;s/^\(\?.*\)/\1/;s/^//" \
-)
-