]> git.madduck.net Git - etc/mutt.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

add more flexible header manipulation
authormartin f. krafft <madduck@madduck.net>
Tue, 16 Sep 2008 13:46:45 +0000 (14:46 +0100)
committermartin f. krafft <madduck@madduck.net>
Tue, 16 Sep 2008 13:46:45 +0000 (14:46 +0100)
.mutt/append-header [new symlink]
.mutt/edit-header [new file with mode: 0755]
.mutt/filter-proxy [new file with mode: 0755]
.mutt/get-timestamp [new file with mode: 0755]
.mutt/remove-header [new symlink]
.mutt/replace-header [new symlink]
.mutt/supersede-header [new symlink]

diff --git a/.mutt/append-header b/.mutt/append-header
new file mode 120000 (symlink)
index 0000000..5cc745f
--- /dev/null
@@ -0,0 +1 @@
+edit-header
\ No newline at end of file
diff --git a/.mutt/edit-header b/.mutt/edit-header
new file mode 100755 (executable)
index 0000000..3a3a96a
--- /dev/null
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# edit-header - helper script to append/replace/remove headers with mutt
+#
+# Based on an idea by David Champion <dgc at uchicago.edu>
+#
+# Copyright © 2008 martin f. krafft <madduck@madduck.net>
+# Released under the terms of the Artistic Licence 2.0
+#
+set -euvx
+
+if [ ! -x "$(command -v formail)" ]; then
+  echo E: formail not installed. >&2
+  exit 1
+fi
+
+header="${1:-}"
+if [ -z "$header" ]; then
+  echo "E: no header specified" >&2
+  exit 1
+fi
+
+get_header_contents()
+{
+  local contents
+  printf "Enter ${1:-header} contents: " >/dev/tty
+  read contents </dev/tty
+  echo "$contents"
+}
+
+script="${0%/*}/${2:-}"
+if [ -f "$script" ] && [ -x "$script" ]; then
+  contents_source="$script"
+  shift
+else
+  contents_source=get_header_contents
+fi
+
+editor=
+case "$0" in
+  *append-header|*supersede-header|*replace-header)
+    contents="${2:-}"
+    [ -n "$contents" ] || contents="$(eval $contents_source $header)"
+    case "$0" in
+      *append-header) flag=-A;;
+      *supersede-header) flag=-i;;
+      *replace-header) flag=-I;;
+    esac
+    editor="${0%/*}/filter-proxy formail $flag \'$header: $contents\'"
+    ;;
+
+  *remove-header)
+    editor="${0%/*}/filter-proxy formail -I \'$header:\'"
+    ;;
+
+  *)
+    echo "E: unknown invocation: ${0##*/}" >&2
+    exit 1
+    ;;
+
+esac
+
+echo "set my_editor=\"\$editor\'"
+echo "set editor=\"$editor\""
+echo "push <tag-prefix><edit>"
+# we need to push this so it happens after the editing
+echo "push :set editor=\"\$my_editor\"<enter>"
diff --git a/.mutt/filter-proxy b/.mutt/filter-proxy
new file mode 100755 (executable)
index 0000000..bd54b44
--- /dev/null
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# filter-proxy - enable filters to work on real files (using tmpfiles)
+#
+# Copyright © 2008 martin f. krafft <madduck@madduck.net>
+# Released under the terms of the Artistic Licence 2.0
+#
+set -euvx
+
+cmd=
+file=
+while [ -n "${1:-}" ]; do
+  if [ -z "${2:-}" ]; then
+    file="$1"
+  else
+    case "$1" in
+      *' '*) cmd="$cmd '$1'";;
+      *) cmd="$cmd $1";;
+    esac
+  fi
+  shift
+done
+
+TMPFILE="$(tempfile -p proxy)"
+trap "rm -f $TMPFILE" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+
+eval $cmd <"$file" >$TMPFILE
+cat $TMPFILE >"$file"
+
+rm -f $TMPFILE
+trap - 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15
diff --git a/.mutt/get-timestamp b/.mutt/get-timestamp
new file mode 100755 (executable)
index 0000000..4a1c524
--- /dev/null
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# get-timestamp - helper script to obtain a timestamp from the user
+#
+# Copyright © 2008 martin f. krafft <madduck@madduck.net>
+# Released under the terms of the Artistic Licence 2.0
+#
+set -eu
+
+printf 'When should I tickle you about this message? ' >/dev/tty
+read timespec </dev/tty
+
+case "$timespec" in
+  @[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]|*' '*)
+    date="$timespec";;
+  *[0-9]y) date="now + ${timespec%y} years 00:00";;
+  *[0-9]m) date="now + ${timespec%m} months 00:00";;
+  *[0-9]w) date="now + ${timespec%w} weeks 00:00";;
+  *[0-9]d) date="now + ${timespec%d} days 00:00";;
+  *[0-9]h) date="now + ${timespec%h} hours";;
+  *[!0-9]*) 
+    echo "E: invalid timespec: $timespec" >&2
+    exit 1
+    ;;
+  *) date="now + $timespec days 00:00";;
+esac
+
+exec date +'%s (%c)' -d "$date"
diff --git a/.mutt/remove-header b/.mutt/remove-header
new file mode 120000 (symlink)
index 0000000..5cc745f
--- /dev/null
@@ -0,0 +1 @@
+edit-header
\ No newline at end of file
diff --git a/.mutt/replace-header b/.mutt/replace-header
new file mode 120000 (symlink)
index 0000000..5cc745f
--- /dev/null
@@ -0,0 +1 @@
+edit-header
\ No newline at end of file
diff --git a/.mutt/supersede-header b/.mutt/supersede-header
new file mode 120000 (symlink)
index 0000000..5cc745f
--- /dev/null
@@ -0,0 +1 @@
+edit-header
\ No newline at end of file