From a44e75119c03822587e1dfa4a6053385c1a777c7 Mon Sep 17 00:00:00 2001 From: nirenjan Date: Tue, 10 Sep 2013 14:05:00 -0700 Subject: [PATCH] Add supplemental log handling to mlog This also takes care of deleting temp log files --- scripts/mlog | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/scripts/mlog b/scripts/mlog index 0fe79c9..2e61fb4 100755 --- a/scripts/mlog +++ b/scripts/mlog @@ -15,25 +15,35 @@ [[ -z $EDITOR ]] && EDITOR=vim MLOG_HDR='' +MLOG_TS="[$(date)]" +MLOG_LOG="$MLOG_FOLDER/$(date +%Y-%m)" +MLOG_FILE="$TMPDIR/mlog-tmp-$$" if [[ -x $HOME/bin/stardate ]] then [[ -z $MLOG_RANK ]] && MLOG_RANK='Chief Engineer' - MLOG_HDR="$MLOG_RANK's log, Stardate $($HOME/bin/stardate)\n" + MLOG_HDR=`echo "$MLOG_RANK's log, Stardate $($HOME/bin/stardate)" | sed 's/.$//'` + + if [[ -e $MLOG_LOG ]] + then + MLOG_LAST=$(grep Stardate $MLOG_LOG | tail -1) + + if [[ "$MLOG_LAST" == "$MLOG_HDR" ]] + then + MLOG_HDR="$MLOG_RANK's log, supplemental" + fi + fi fi -MLOG_HDR="$MLOG_HDR[$(date)]" - -MLOG_FILE="$TMPDIR/mlog-tmp-$$" - $EDITOR $MLOG_FILE -[[ ! -s $MLOG_FILE ]] && exit 0 +[[ ! -s $MLOG_FILE ]] && rm -f $MLOG_FILE && exit 0 -MLOG_LOG="$MLOG_FOLDER/$(date +%Y-%m)" -echo -e "$MLOG_HDR\n" >> $MLOG_LOG +echo "$MLOG_HDR" >> $MLOG_LOG +echo "$MLOG_TS" >> $MLOG_LOG +echo >> $MLOG_LOG # Empty line cat $MLOG_FILE >> $MLOG_LOG echo -e "\n----------------------------------------\n" >> $MLOG_LOG