From 177651bddab145c8a56cdfeb0d57b5fd95a6d0e2 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 27 Jun 2019 09:32:46 -0400 Subject: Move contrib -> filters --- Makefile | 6 +++--- contrib/hldiff | 39 --------------------------------------- contrib/html | 10 ---------- contrib/plaintext | 13 ------------- filters/hldiff | 39 +++++++++++++++++++++++++++++++++++++++ filters/html | 10 ++++++++++ filters/plaintext | 13 +++++++++++++ 7 files changed, 65 insertions(+), 65 deletions(-) delete mode 100755 contrib/hldiff delete mode 100755 contrib/html delete mode 100755 contrib/plaintext create mode 100755 filters/hldiff create mode 100755 filters/html create mode 100755 filters/plaintext diff --git a/Makefile b/Makefile index 4617118..4ff1aae 100644 --- a/Makefile +++ b/Makefile @@ -63,9 +63,9 @@ install: all install -m644 config/accounts.conf $(SHAREDIR)/accounts.conf install -m644 aerc.conf $(SHAREDIR)/aerc.conf install -m644 config/binds.conf $(SHAREDIR)/binds.conf - install -m755 contrib/hldiff $(SHAREDIR)/filters/hldiff - install -m755 contrib/html $(SHAREDIR)/filters/html - install -m755 contrib/plaintext $(SHAREDIR)/filters/plaintext + install -m755 filters/hldiff $(SHAREDIR)/filters/hldiff + install -m755 filters/html $(SHAREDIR)/filters/html + install -m755 filters/plaintext $(SHAREDIR)/filters/plaintext RMDIR_IF_EMPTY:=sh -c '\ if test -d $$0 && ! ls -1qA $$0 | grep -q . ; then \ diff --git a/contrib/hldiff b/contrib/hldiff deleted file mode 100755 index b672e21..0000000 --- a/contrib/hldiff +++ /dev/null @@ -1,39 +0,0 @@ -# vim: set ft=awk : -BEGIN { - bright = "\x1B[1m" - red = "\x1B[31m" - green = "\x1B[32m" - cyan = "\x1B[36m" - reset = "\x1B[0m" - - hit_diff = 0 -} -{ - if (hit_diff == 0) { - if ($0 ~ /^diff /) { - hit_diff = 1; - print bright $0 reset - } else if ($0 ~ /^.*\|.*(\+|-)/) { - left = substr($0, 0, index($0, "|")-1) - right = substr($0, index($0, "|")) - gsub(/-+/, red "&" reset, right) - gsub(/\++/, green "&" reset, right) - print left right - } else { - print $0 - } - } else { - if ($0 ~ /^-/) { - print red $0 reset - } else if ($0 ~ /^+/) { - print green $0 reset - } else if ($0 ~ /^ /) { - print $0 - } else if ($0 ~ /^@@ (-[0-9]+,[0-9]+ \+[0-9]+,[0-9]+) @@.*/) { - sub(/^@@ (-[0-9]+,[0-9]+ \+[0-9]+,[0-9]+) @@/, cyan "&" reset) - print $0 - } else { - print bright $0 reset - } - } -} diff --git a/contrib/html b/contrib/html deleted file mode 100755 index db7808a..0000000 --- a/contrib/html +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# aerc filter which runs w3m using socksify (from the dante package) to prevent -# any phoning home by rendered emails -export SOCKS_SERVER="127.0.0.1:1" -exec socksify w3m \ - -T text/html \ - -cols $(tput cols) \ - -dump \ - -o display_image=false \ - -o display_link_number=true diff --git a/contrib/plaintext b/contrib/plaintext deleted file mode 100755 index 71e33f7..0000000 --- a/contrib/plaintext +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set ft=awk : -BEGIN { - dim = "\x1B[2m" - cyan = "\x1B[36m" - reset = "\x1B[0m" -} -{ - if ($0 ~ /^On .*, .* wrote:/ || $0 ~ /^>+/) { - print dim cyan $0 reset - } else { - print $0 - } -} diff --git a/filters/hldiff b/filters/hldiff new file mode 100755 index 0000000..b672e21 --- /dev/null +++ b/filters/hldiff @@ -0,0 +1,39 @@ +# vim: set ft=awk : +BEGIN { + bright = "\x1B[1m" + red = "\x1B[31m" + green = "\x1B[32m" + cyan = "\x1B[36m" + reset = "\x1B[0m" + + hit_diff = 0 +} +{ + if (hit_diff == 0) { + if ($0 ~ /^diff /) { + hit_diff = 1; + print bright $0 reset + } else if ($0 ~ /^.*\|.*(\+|-)/) { + left = substr($0, 0, index($0, "|")-1) + right = substr($0, index($0, "|")) + gsub(/-+/, red "&" reset, right) + gsub(/\++/, green "&" reset, right) + print left right + } else { + print $0 + } + } else { + if ($0 ~ /^-/) { + print red $0 reset + } else if ($0 ~ /^+/) { + print green $0 reset + } else if ($0 ~ /^ /) { + print $0 + } else if ($0 ~ /^@@ (-[0-9]+,[0-9]+ \+[0-9]+,[0-9]+) @@.*/) { + sub(/^@@ (-[0-9]+,[0-9]+ \+[0-9]+,[0-9]+) @@/, cyan "&" reset) + print $0 + } else { + print bright $0 reset + } + } +} diff --git a/filters/html b/filters/html new file mode 100755 index 0000000..db7808a --- /dev/null +++ b/filters/html @@ -0,0 +1,10 @@ +#!/bin/sh +# aerc filter which runs w3m using socksify (from the dante package) to prevent +# any phoning home by rendered emails +export SOCKS_SERVER="127.0.0.1:1" +exec socksify w3m \ + -T text/html \ + -cols $(tput cols) \ + -dump \ + -o display_image=false \ + -o display_link_number=true diff --git a/filters/plaintext b/filters/plaintext new file mode 100755 index 0000000..71e33f7 --- /dev/null +++ b/filters/plaintext @@ -0,0 +1,13 @@ +# vim: set ft=awk : +BEGIN { + dim = "\x1B[2m" + cyan = "\x1B[36m" + reset = "\x1B[0m" +} +{ + if ($0 ~ /^On .*, .* wrote:/ || $0 ~ /^>+/) { + print dim cyan $0 reset + } else { + print $0 + } +} -- cgit v1.2.3