From d49b85e988a507b971ab5df9167d24be618751e6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 4 Apr 2015 11:25:25 +0100
Subject: [PATCH] Command for removing ignore rules

---
 Makefile                       |   4 ++
 debian/source/include-binaries |   1 +
 man/freedombone-unignore.1.gz  | Bin 0 -> 609 bytes
 src/freedombone-unignore       |  85 +++++++++++++++++++++++++++++++++
 4 files changed, 90 insertions(+)
 create mode 100644 man/freedombone-unignore.1.gz
 create mode 100755 src/freedombone-unignore

diff --git a/Makefile b/Makefile
index 19f50aa8..0ea6d413 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ install:
 	install -m 755 src/${APP}-rmlist ${DESTDIR}${PREFIX}/bin
 	install -m 755 src/${APP}-rmemail ${DESTDIR}${PREFIX}/bin
 	install -m 755 src/${APP}-ignore ${DESTDIR}${PREFIX}/bin
+	install -m 755 src/${APP}-unignore ${DESTDIR}${PREFIX}/bin
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}-prep.1.gz ${DESTDIR}${PREFIX}/share/man/man1
@@ -37,6 +38,7 @@ install:
 	install -m 644 man/${APP}-rmlist.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}-rmemail.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}-ignore.1.gz ${DESTDIR}${PREFIX}/share/man/man1
+	install -m 644 man/${APP}-unignore.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 uninstall:
 	rm -f ${PREFIX}/share/man/man1/${APP}.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-prep.1.gz
@@ -51,6 +53,7 @@ uninstall:
 	rm -f ${PREFIX}/share/man/man1/${APP}-rmlist.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-rmemail.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-ignore.1.gz
+	rm -f ${PREFIX}/share/man/man1/${APP}-unignore.1.gz
 	rm -rf ${PREFIX}/share/${APP}
 	rm -f ${PREFIX}/bin/${APP}
 	rm -f ${PREFIX}/bin/${APP}-prep
@@ -64,6 +67,7 @@ uninstall:
 	rm -f ${PREFIX}/bin/${APP}-renew-cert
 	rm -f ${PREFIX}/bin/${APP}-rmlist
 	rm -f ${PREFIX}/bin/${APP}-ignore
+	rm -f ${PREFIX}/bin/${APP}-unignore
 clean:
 	rm -f \#* \.#* debian/*.substvars debian/*.log
 	rm -fr deb.* debian/${APP}
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 15939f00..e3dd9c93 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -11,3 +11,4 @@ man/freedombone-renew-cert.1.gz
 man/freedombone-rmlist.1.gz
 man/freedombone-rmemail.1.gz
 man/freedombone-ignore.1.gz
+man/freedombone-unignore.1.gz
diff --git a/man/freedombone-unignore.1.gz b/man/freedombone-unignore.1.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8d8f7e25a092cdc75a58a01d3b001e00e7f5ee99
GIT binary patch
literal 609
zcmV-n0-pUJiwFSAyB}2m1D#XLZqq;%-TN!9ya6QQv<0LRA=IRpq#|je+M$Bd#n`^K
zhuU+^Jeub389xGz;w&J_B0BeR&OK-1g)>McVnSs^0tZI$Opru41^47Fj4KIeC#UaR
zaP9Z=-$qy~lrI!4m@uqx9mfl1;9idxzU%bv`!RqUEa?#yFaaGXO@WY-1O^#@L;+Yb
zUI0rHiAsSjw7`bz9F&QEVyvOymOdt-85dk+pz%p}{K2>D<tn%ej%XMdxHDF_U?twe
z0O4+r&q5mR>UF@y9^HMn|C1kF-dwH1tL3%p{LeY*@srf^o7(YOiq}#5Ppqs8be)hu
zX{uVzy0_hzN-F>Gc8nv(0sA@TMY-LXQG2obePLUz3g;NnCPzE2bL<U7HKPB4ScBUY
z>OuRE!o2CBN^`Q#TH8di1&O~5mzV%gVM_*>9f*yTD738>lx20zUalHxl1Mif*>n=v
zFrh&c#5ogLtG$j&wOI+WfNZ-hV{_S7X)JfvPuA0*j=LhMAu^ebTsz(ba;+;h8V)lX
zrHQ<l%3;J*F5}^|!-rfcgKGCceILg2V7d1|U!J~tz2}vUFGi{R@Fs)4Lc!JHKwNNZ
z&;i^Ue%MVS<=FvTNvsY)X&=8nTw(LT&7fDjEc>;~vRAso*kYY+<8?S&-nh<$B3O{t
zl9liwqUb_WM4HFSGY_7okB%2fXEj|7r>p4*{PFwqGylzbgHE_E?O%drID*Mya2DU1
vyqr9KO;S0_=kz^HRCW3A1$jtvjVhQoQ@0q6nw)LS`&`a%7ERY!It2g#CA}>&

literal 0
HcmV?d00001

diff --git a/src/freedombone-unignore b/src/freedombone-unignore
new file mode 100755
index 00000000..d8248d95
--- /dev/null
+++ b/src/freedombone-unignore
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+# Removes an ignore rule for either an email address
+# or text in the subject line
+
+# License
+# =======
+#
+# Copyright (C) 2015 Bob Mottram <bob@robotics.uk.to>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+MYUSERNAME=$USER
+EMAIL_ADDRESS=
+SUBJECT_TEXT=
+
+function show_help {
+    echo ''
+    echo 'freedombone-unignore -u [username] -e [mail address] -t [text in subject line]'
+    echo ''
+    exit 0
+}
+
+while [[ $# > 1 ]]
+do
+key="$1"
+
+case $key in
+    -h|--help)
+    show_help
+    ;;
+    -u|--user)
+    shift
+    MYUSERNAME="$1"
+    ;;
+    -e|--email)
+    shift
+    EMAIL_ADDRESS="$1"
+    ;;
+    -t|--text)
+    shift
+    SUBJECT_TEXT="$1"
+    ;;
+    *)
+    # unknown option
+    ;;
+esac
+shift
+done
+
+if ! [[ $MYUSERNAME && $EMAIL_ADDRESS ]]; then
+    if ! [[ $MYUSERNAME && $SUBJECT_TEXT ]]; then
+        show_help
+    fi
+fi
+
+MUTTRC=/home/$MYUSERNAME/.muttrc
+PM=/home/$MYUSERNAME/.procmailrc
+
+# unignore if subject line contains text
+if [ $SUBJECT_TEXT ]; then
+    if ! grep -q "Ignore rule for $SUBJECT_TEXT" $PM; then
+        sed -i "/# Ignore rule for $SUBJECT_TEXT/,/# End of ignore rule/d" $PM
+    fi
+fi
+
+# unignore an email address
+if [ $EMAIL_ADDRESS ]; then
+    if ! grep -q "Ignore rule for $EMAIL_ADDRESS" $PM; then
+        sed -i "/# Ignore rule for $EMAIL_ADDRESS/,/# End of ignore rule/d" $PM
+    fi
+fi
+
+exit 0