delete must match exact

This commit is contained in:
Luke Smith 2019-04-16 11:09:50 -04:00
parent d1e7f448df
commit 401cbbd002
No known key found for this signature in database
GPG Key ID: 4C50B54A911F6252
2 changed files with 4 additions and 4 deletions

View File

@ -1,8 +1,8 @@
#! /bin/sh #! /bin/sh
#### Determine size of Terminal #### Determine size of Terminal
height=`stty size | awk 'BEGIN {FS = " "} {print $1;}'` height=`stty size | awk 'BEGIN {FS = " "} {print $1;}'`
width=`stty size | awk 'BEGIN {FS = " "} {print $2;}'` width=`stty size | awk 'BEGIN {FS = " "} {print $2;}'`
### Display Image / offset with mutt bar ### Display Image / offset with mutt bar
echo -e "2;3;\n0;1;210;20;$((width*7-250));$((height*14-100));0;0;0;0;$1\n4;\n3;" | /usr/lib/w3m/w3mimgdisplay & echo -e "2;3;\n0;1;210;20;$((width*7-250));$((height*14-100));0;0;0;0;$1\n4;\n3;" | /usr/lib/w3m/w3mimgdisplay &

4
mw
View File

@ -273,11 +273,11 @@ pick() { numbered="$(ls $accdir/*muttrc | sed "s/.*\///;s/\..*//" | nl)"
[ -z "$title" ] && printf "Invalid response." && return 1 [ -z "$title" ] && printf "Invalid response." && return 1
return 0 ;} return 0 ;}
delete() { sed -i "/IMAPAccount $title/,/# End profile/d" "$mbsyncrc" delete() { sed -i "/IMAPAccount $title$/,/# End profile/d" "$mbsyncrc"
rm -rf "${accdir:?}/${title:?}" "$creddir/$title.gpg" "$accdir/$title.muttrc" rm -rf "${accdir:?}/${title:?}" "$creddir/$title.gpg" "$accdir/$title.muttrc"
sed -i "/$title.muttrc/d" "$muttdir/personal.muttrc" sed -i "/$title.muttrc/d" "$muttdir/personal.muttrc"
sed -i "/account $title/,/^\(\s*$\|account\)/d" "$HOME/.config/msmtp/config" sed -i "/account $title/,/^\(\s*$\|account\)/d" "$HOME/.config/msmtp/config"
confirm "delete the local mail repository as well?" && rm -rf "${maildir:?}/${title:?}" #confirm "delete the local mail repository as well?" && rm -rf "${maildir:?}/${title:?}"
} }
choosecron() { ! pgrep crond >/dev/null && echo "No cron manager running. Install/enable one and then select this option again." && return 1 choosecron() { ! pgrep crond >/dev/null && echo "No cron manager running. Install/enable one and then select this option again." && return 1