fix resubmit script to add received header even when there was none

[etc/mailfilter.git] / bin / kill-from

diff --git a/bin/kill-from b/bin/kill-from
index 344418515ac66f5c3066de9ef5fe5be8f8b57dcd..396d23ba1bf7c0acb8c665b8c70acd93a751b78a 100755 (executable)
--- a/bin/kill-from
+++ b/bin/kill-from
@@ -1,7 +1,8 @@
 #!/bin/sh
 set -eu
 
 #!/bin/sh
 set -eu
 

-IGNORE_FILE="${0%/*}/../config/ignore"
+CONFIG_DIR="${0%/*}/../config"
+IGNORE_FILE="$CONFIG_DIR/ignore"

 ME="${0##*/}"
 
 case "$ME" in
 ME="${0##*/}"
 
 case "$ME" in


@@ -19,8 +20,8 @@ case "$ME" in
     esac
     CHECKPREFIX='From: someone <'
     CHECKPOSTFIX='>'
     esac
     CHECKPREFIX='From: someone <'
     CHECKPOSTFIX='>'

-    REPREFIX='^From:.*'
-    REPOSTFIX=''
+    REPREFIX='^From:.*\<'
+    REPOSTFIX='\>'

     ARG="$1"
     ;;
   kill-thread)
     ARG="$1"
     ;;
   kill-thread)


@@ -35,10 +36,10 @@ case "$ME" in
         exit 2
         ;;
     esac
         exit 2
         ;;
     esac

-    CHECKPREFIX='References: <something> '
+    CHECKPREFIX='References: <something> <'

     CHECKPOSTFIX='>'
     CHECKPOSTFIX='>'

-    REPREFIX='^References:.*'
-    REPOSTFIX=''
+    REPREFIX='^References:.*\<'
+    REPOSTFIX='\>'

     ARG="${1#<}"; ARG="${ARG%>}"
     ;;
 esac
     ARG="${1#<}"; ARG="${ARG%>}"
     ;;
 esac


@@ -50,6 +51,9 @@ fi
 
 ARG_ESCAPED="$(echo "$ARG" | sed -re 's,([.+]),\\\1,g')"
 cat <<_eof >> $IGNORE_FILE
 
 ARG_ESCAPED="$(echo "$ARG" | sed -re 's,([.+]),\\\1,g')"
 cat <<_eof >> $IGNORE_FILE

-$^# $(date +%Y.%m.%d.%H.%m.%S) added by ${0##*/}
+$^# added by $ME @$(date +%s)

 $REPREFIX$ARG_ESCAPED$REPOSTFIX
 _eof
 $REPREFIX$ARG_ESCAPED$REPOSTFIX
 _eof

+
+cd $CONFIG_DIR
+git-commit -m"$ME $1" ${IGNORE_FILE##*/}