Merge pull request #21 from drmtmych/master

Add account name to sidebar head.

2 files changed, 12 insertions, 1 deletions

diff --git a/mutt-wizard.sh b/mutt-wizard.sh
index d5092ee..b48343d 100755
--- a/mutt-wizard.sh
+++ b/mutt-wizard.sh
@@ -36,9 +36,20 @@ formatShortcut() { \
 	echo "macro index,pager g$1 \"<change-folder>$data<enter>\" \"Go to $2.\"" >> "$muttdir"accounts/$3.muttrc
 	done ;}
 
+gen_delim() { \
+	delim="="
+	for i in `seq $(( $1 - 1 ))`
+	do
+		delim="$delim-"
+	done
+	echo $delim ;}
+
 detectMailboxes() { \
 	find ~/.mail/$1 -maxdepth 1 -mindepth 1 -type d | sed -e "s/.*\///g;s/^/=/g" > /tmp/$1_boxes
+	sidebar_width=$(sed -n -e '/^set sidebar_width/p' "$muttdir"/muttrc | awk -F'=' '{print $2}')
+	delim=$(gen_delim $sidebar_width)
 	oneline=$(cat /tmp/$1_boxes | tr "\n" " ")
+	oneline="=$1 $delim $oneline"
 	sed -i "/^mailboxes\|^set spoolfile\|^set record\|^set postponed/d" "$muttdir"accounts/$1.muttrc
 	echo mailboxes $oneline >> "$muttdir"accounts/$1.muttrc
 	sed -i "/^macro index,pager g/d" "$muttdir"accounts/$1.muttrc
diff --git a/muttrc b/muttrc
index 88c50e3..aec5da4 100644
--- a/muttrc
+++ b/muttrc
@@ -43,7 +43,7 @@ set sidebar_width = 20
 set sidebar_short_path = yes
 set sidebar_next_new_wrap = yes
 set mail_check_stats
-set sidebar_format = '%B%?F? [%F]?%* %?N?%N/?%S'
+set sidebar_format = '%B%?F? [%F]?%* %?N?%N/? %?S?%S?'
 bind index,pager \Ck sidebar-prev
 bind index,pager \Cj sidebar-next
 bind index,pager \Co sidebar-open