From 3a3b1784a88b7a36de176bbe31be74180e30b405 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Wed, 8 Apr 2015 23:30:11 +0100
Subject: [PATCH] subscribe command in muttrc

---
 man/freedombone-addlist.1.gz | Bin 563 -> 588 bytes
 man/freedombone-rmlist.1.gz  | Bin 727 -> 752 bytes
 src/freedombone-addlist      |  14 +++++++++++++-
 src/freedombone-rmlist       |  13 ++++++++++++-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/man/freedombone-addlist.1.gz b/man/freedombone-addlist.1.gz
index cfca99244c439da4302c50da47346bee7d903a89..370295f4fe8078c37587fb9b707826b0d6810888 100644
GIT binary patch
literal 588
zcmV-S0<--eiwFRdt0h$c1C3KrZ<{a>e&<)5c-bZmvb37iMbp%zV@b58iAu6+%lcs8
z0I%3awrR`1-$6;Y3@Q!z#oyh1_uc2i-!354h=~%BlIXD{DY&sP2KRIfE2iP(-T1u=
zE}bub@?d9BzcQ2{D^|FU<A)1yucoWOb%yAEdN55A0}KS?1(zALuvK7l1Z+SswXrBV
zs_^^OdJ`_gVLGpZeMJf+6L<?=0sAA`4mPkiRrCvEYQ!=E5cX~SsUMMPH0HMJ_&EqK
zu9utba((4G|0&k*YJ*26$^yv;pzj66qCQA&6uY86qIVm;qHf7asHhw8T+~FwxOALQ
z!9$J`?@<GjoeFM1V~qSB6L{b@C&`D2i5Q!)$(ok*wh=FZTS_bnh$yI;G%0GT?M6#g
zkq~{VG+mi(b@{MNp;i?rA*i@XdmclTmMi&0+yvrEYm~N4cy2?N<lxh6H>Vf9#!_hu
zQI(O$*70YMTU(mRXq3?mRpiG?j3Q=o9gqI<a>R|P&>R*d2w-{{u8$Vv_4v)(f9;P^
z+abJla47I7%Cd*Y1*ggSu#zdydN9wV(tS0h#y+z~p=>{wjKl|TP`nny+O=pNYycjd
z$Y9*VD*1x)hQTYDF%;<@V7l8b*4M5xQxU9`rEL=MF;daFR*|wiHhy*ITlLBDBkgSF
zo6&qTpFlAEaCQ=$p0((VTS0#y%Wwj-m3I=~RJoYle@jxm$S>88ZDPucyRXQ%O7GBw
amu=MzMw519Xkm_fIllq+-x0*l1ONcG(jnyl

literal 563
zcmV-30?hp%iwFSqF(Fj|1C3JekCQ+U{mx%8;ftCG*j`M|#u&?qZDW6>v|hCK!vX`W
z$L^BdrM>?5E=W%+Tq5DizL|OR-psh$DWnoH5iAlM9g-vkRT>6h-wa?uBn;mS-r8WB
z|MQ<b*eR4Rlu6(fDQwGf!ztLy@glITKDr+cjFUtG0Y+#+c?J!v1?U_BYY@~~X=E)`
z_-(mbhqJJs&Z%Hu83mj$Jb+Wc{))DR73@_N{lwTbBH5v3{uG3Fo7s9hTP<ztKSjB1
zZSY7~S)lO?=6gmNJ71*L%4~MNqPJ^Z>|8^Z6$&`z$nl602ya_b1rlSVM@-;Eb#C-s
zY#0`-y%@g@!=YBnfohXj6cCx9BwVE^O>OHV6-8p`Qz6Zh=thJKvlPyv0>PLmuG5}0
zi&9g;e-qb%xRMgNZW5l_m`8FMioctfHEpmIQbSZ_W}w<~eaN*g)yVTQ<DrV&STHXl
zDwnbM*Wf&=RE6rY^&o)pJX~FE{pH}*>wjk*qttzPGr_*VBP+`e9v9R&>%xMkH0!`L
z<3e`TloGql5}DB5Tr)^KIlbZ~>(?$>y|5m**O9`wgH`+)<u!v-5~WO}UBGy^ovt>v
z<%<XwLYr%1@IDgJM=2tqX{_Ap!PVk}<wnw4PuAXKJsCkTes?<zZf+aYr<$QsB*PK-
z3uhSLS2^>KUz1c$^SSuGO;maJ@CE5s$Q`P1-c;RVG-@u!9L#ku>la4b;-jMk005mN
B5F`Kq

diff --git a/man/freedombone-rmlist.1.gz b/man/freedombone-rmlist.1.gz
index c85701372c4525402db204d562d30034cf3c96e7..f644056f683a6d58e57983231c06bcf8e9bb0ea8 100644
GIT binary patch
literal 752
zcmV<M0uTKkiwFS4t0h$c18r2>ZrVT)efL+4{E}9R?OaqTMO76@DMSqcacR`1d05+H
zyoz_%-3x@j@2oLuDYk56&(54VbM`Fpatwt=%#}!$#7K*Z8w-~ZUR*=J)^K%k`5}am
z?yrB-U}aFB8JIBXSQQ3Ayck3H*q;o;pabn!1alN>g9aD~#w#w@(5zSmwnRW51hX?1
zMGLn0@i?6=?iZbak%MPP6eJV)0#OCeN2qNW;ko(Tqq98MXv|BC|7Ezio8Qlt_tVEP
zSeD#?ZYg>~O<kd?95u<K1f=NEH{9^FLfCR!atRY>?Kz~*LawM#Dtf^REjAc!xzf#7
ztyR|W(5}K5#warcUcgQ{$dt5PI`ndA%#d#mk`z?U_H4MNwiT&l{clRinn_cj#{3|o
zrsf+a56t(}wo0B^pKlOl90dJ#(ELC!V-k!@4gPj0ZME~c8Y7g9M$N$)KRLk%@!-fR
zB&a7AWJ(AobArC#kF({b^ppx$5n8JVJJOW$8zDTdBujW3Q7-1(`Zh_a1SW?aPU3@j
zItzRytBmSUy4ffqpvjlK%DD!5FtbYUVraIQZYtv`YG#r8v9>j++K0FzCA^f3oJkwJ
zHeQ^)di!=cq*Rq<JSVB*)=I-SCh7|57yw<}b``tBG~TYE*tLfB>!G)**!kC6v7=hX
zWeYu6jpzi-u~wQ`I3mOvfl6y@(@T;y8PTONZ9$SUQ|c`Fr+vbWacB+)YB+@c!(w`L
zpx#}+KmUJIGt{;#-Z-*r!4vO_zlpj&iDwlj=}y9YEtNi{Lnou)>yvP;@f6wH+MYsa
zl(>yLhti^ZCM`Ot8_Z5(J~679F|^VO-Cr%o(|H&SR0<Pi>6i-ml&bVrt5jK@nb^I?
zR(%fQR0p%sEE&y4Js9>s-dqi@Z<^?UTS5O-Y>hn_Oropo$(3TT`JNYgTt29u%iPp=
iuiua_m0qD)JTz5LnD!cHkTH&X1%Cj`<@AZ?1pokNt!&Hy

literal 727
zcmV;|0x10-iwFREG9gs}18q~=ZrVT)efL+4{E}9R?OaqTMO9TuDWHacxHM|hKCJBl
zuj1Wx_X6SXJ8NvU6eDB7?97=nXU@i}F>Ewqu0*ONMp~5ISh$Ap>K6KyhMTMFcOiuI
zeEFLOYlHg2z?4bH$}kAx<ru=p{&W}y9cVuzSfEflG{8VGUUIpG`ot=*1p@jYn1it>
z8nET}$Ju;2S#|<O4xSxRkWAn&h)Q@qL9N3L&gbFseleM^CbP#dSQXrWZm9Uib^1n?
zIckzY2}seS?6~1+iLmFk;1Z_J+Dk~Cg<MggRP+N&v{+*_<x1E8Dy_158tqDqVT>|E
z;2St72bq$VONV}JjT!P?JNkyI*^v#m)V3rwtbeDJteG?$)R?z&X==V>vSogxwpa4P
z`h0^Z;~?lagXS&4j7cyqHTc`1wB^C)YK%}a8Z`%J{Nw~5#Dfz{usrv~f=mg)WKPhN
z<2ZY63QuX{N<wQCVJDhWel3K@m9%<q7s|z)Ti+%rl)$9jWD>XH=`8S-tTd`a>3UH_
zK$HJ?nR5;F#mp*wh@oCFJygb1)XXCFV@+#Nl@D=6N_Z(5Igl2-HC~*fddGG-q*Rq<
zJSVB*#!ACiCaMz2?m(YzTZ%(Fjkjee4vjJWd3#R=>k-*{ftAwK(ouI-t5H~6nO>4?
z$#pJ`N$(_OrqEgPPp^a<<IuFXWH^NW!*X_VOWs_+z5IWJ8EV@VukF`$;0brdUqw}&
z#j}!=PG@1hl}ew}p=+?=+p}<`@f_KE*q%dZl(>&Nhti^ZCM`Ot8_dpPJ~678F?7-h
z-CwW9vqcyTR0>mN=}rpxkgD{PR;jW)GqHP#t@;?msSf6&c`}-hdNAz2zq=XU-qq0o
zw*rk}TkOGL8r@`1t`LLWw|t|=#e@2>%1w3u@)h|?={1_=LtXWRX|Hw$8RN89@CWHl
JuqC_&0029UZY2N!

diff --git a/src/freedombone-addlist b/src/freedombone-addlist
index d95704dc..8a8f4ca7 100755
--- a/src/freedombone-addlist
+++ b/src/freedombone-addlist
@@ -32,10 +32,11 @@
 MYUSERNAME=$USER
 MAILINGLIST=
 SUBJECTTAG=
+LIST_ADDRESS=
 
 function show_help {
     echo ''
-    echo 'freedombone-addlist -u [username] -l [mailing list name] -s [subject tag]'
+    echo 'freedombone-addlist -u [username] -l [mailing list name] -s [subject tag] -e [list email address]'
     echo ''
     exit 0
 }
@@ -60,6 +61,10 @@ case $key in
     shift
     SUBJECTTAG="$1"
     ;;
+    -e|--email)
+    shift
+    LIST_ADDRESS="$1"
+    ;;
     *)
     # unknown option
     ;;
@@ -113,4 +118,11 @@ if [[ $MUTT_MAILBOXES != *$MAILINGLIST* ]]; then
     chown $MYUSERNAME:$MYUSERNAME $MUTTRC
 fi
 
+if [ $LIST_ADDRESS ]; then
+    sed -i "s|unsubscribe $LIST_ADDRESS|subscribe $LIST_ADDRESS|g" $MUTTRC
+    if ! grep -q "subscribe $LIST_ADDRESS" $MUTTRC; then
+        echo "subscribe $LIST_ADDRESS" >> $MUTTRC
+    fi
+fi
+
 exit 0
diff --git a/src/freedombone-rmlist b/src/freedombone-rmlist
index d60a85d3..ac1b939c 100755
--- a/src/freedombone-rmlist
+++ b/src/freedombone-rmlist
@@ -31,10 +31,11 @@
 
 MYUSERNAME=$USER
 MAILINGLIST=
+LIST_ADDRESS=
 
 function show_help {
     echo ''
-    echo 'freedombone-rmlist -u [username] -l [mailing list name]'
+    echo 'freedombone-rmlist -u [username] -l [mailing list name] -e [list email address]'
     echo ''
     exit 0
 }
@@ -55,6 +56,10 @@ case $key in
     shift
     MAILINGLIST="$1"
     ;;
+    -e|--email)
+    shift
+    LIST_ADDRESS="$1"
+    ;;
     *)
     # unknown option
     ;;
@@ -73,4 +78,10 @@ if [[ $MUTT_MAILBOXES == *$MAILINGLIST* ]]; then
     chown $MYUSERNAME:$MYUSERNAME $MUTTRC
 fi
 
+if [ $LIST_ADDRESS ]; then
+    if ! grep -q "unsubscribe $LIST_ADDRESS" $MUTTRC; then
+        sed -i "s|subscribe $LIST_ADDRESS|unsubscribe $LIST_ADDRESS|g" $MUTTRC
+    fi
+fi
+
 exit 0