diff options
author | Rob Austein <sra@hactrn.net> | 2010-01-01 22:25:43 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2010-01-01 22:25:43 +0000 |
commit | 6679f851f2041f0dedd574237402502bd68315a6 (patch) | |
tree | 65e8d9442d6cc3091d40723c68f5f02d3e65f7be /scripts/application-x-rpki-mailcap-handler.sh | |
parent | 43220ad7bb5698ac91044f6511326cc39d43e309 (diff) |
Cleanup
svn path=/scripts/application-x-rpki-mailcap-handler.sh; revision=2921
Diffstat (limited to 'scripts/application-x-rpki-mailcap-handler.sh')
-rwxr-xr-x | scripts/application-x-rpki-mailcap-handler.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/scripts/application-x-rpki-mailcap-handler.sh b/scripts/application-x-rpki-mailcap-handler.sh index 33d3dc32..891987d9 100755 --- a/scripts/application-x-rpki-mailcap-handler.sh +++ b/scripts/application-x-rpki-mailcap-handler.sh @@ -24,7 +24,7 @@ # # 2) Add to ~/.mailcap # -# application/x-rpki; /this/script.sh ; copiousoutput +# application/x-rpki; /path/to/this/script.sh ; copiousoutput # # "copiousoutput" is required by mutt to enable auto_view (inline # display) behavior. @@ -39,11 +39,15 @@ #exec 2>&1; set -x +: ${AWK=/usr/bin/awk} : ${OPENSSL=$(/usr/bin/dirname $0)/../openssl/openssl/apps/openssl} +: ${SPLITBASE64=$(/usr/bin/dirname $0)/splitbase64.xsl} +: ${XMLINDENT=/usr/local/bin/xmlindent} : ${XMLLINT=/usr/local/bin/xmllint} : ${XSLTPROC=/usr/local/bin/xsltproc} -: ${SPLITBASE64=$(/usr/bin/dirname $0)/splitbase64.xsl} -OPENSSL_CONF=/dev/null $OPENSSL cms -verify -nosigs -noverify -inform DER 2>/dev/null | -$XSLTPROC $SPLITBASE64 - | -$XMLLINT -format - +# This produces prettier output, but also hangs sometimes, apparently some xmlindent bug dealing with really long XML attributes +#OPENSSL_CONF=/dev/null $OPENSSL cms -verify -nosigs -noverify -inform DER 2>/dev/null | $XSLTPROC $SPLITBASE64 - | $XMLINDENT -i 2 | $AWK NF + +# So we do this instead +OPENSSL_CONF=/dev/null $OPENSSL cms -verify -nosigs -noverify -inform DER 2>/dev/null | $XSLTPROC $SPLITBASE64 - | $XMLLINT -format - |