.mailcap: test python

diff --git a/.mailcap b/.mailcap
index 601f870806ba98a040e80be58bacca8f56ab33f0..3fac1f0b288097c791ce1c0799e55f4fa85cc403 100644 (file)
--- a/.mailcap
+++ b/.mailcap
@@ -18,7 +18,7 @@ application/postscript; pstotext %s; copiousoutput; description="PostScript file
 application/vnd.oasis.opendocument.text; odt2txt %s | less; edit=libreoffice %s; needsterminal; description="OpenDocument files"; test=test -n "`which odt2txt 2>/dev/null`" -a -n "`which less 2>/dev/null`"
 application/vnd.oasis.opendocument.text; odt2txt %s | more; edit=libreoffice %s; needsterminal; description="OpenDocument files"; test=test -n "`which odt2txt 2>/dev/null`" -a -n "`which more 2>/dev/null`"
 application/vnd.oasis.opendocument.text; odt2txt %s; copiousoutput; description="OpenDocument files"; test=test -n "`which odt2txt 2>/dev/null`"
-application/x-bittorrent; bittorrent.py %s; test=test -n "$DISPLAY" -a -n "`which bittorrent.py 2>/dev/null`"
+application/x-bittorrent; bittorrent.py %s; test=test -n "$DISPLAY" -a -n "`which python 2>/dev/null`" -a -n "`which bittorrent.py 2>/dev/null`"
 application/x-chm; fbreader %s; description="Compiled HTML files"; test=test -n "$DISPLAY" -a -n "`which fbreader 2>/dev/null`"
 application/x-dvi; xdvi %s; description="DVI files"; test=test -n "$DISPLAY" -a -n "`which xdvi 2>/dev/null`"
 application/x-fb2; fbreader %s; description="FicionBook fb2 files"; test=test -n "$DISPLAY" -a -n "`which fbreader 2>/dev/null`"
@@ -31,8 +31,8 @@ application/msword; doc2html2 %s; copiousoutput; description="M$ Word Text"; tes
 application/msword; catdoc %s; copiousoutput; description="M$ Word Text"; test=test -n "`which catdoc 2>/dev/null`"
 application/msword; wordview %s; edit=libreoffice %s; description="M$ Word Text"; test=test -n "$DISPLAY" -a -n "`which wordview 2>/dev/null`"
 application/vnd.ms-excel; xls2csv %s; copiousoutput; description="M$ Excel files"; test=test -n "`which xls2csv 2>/dev/null`"
-application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s - | iconv.py -f utf-8 | less; edit=libreoffice %s; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`" -a -n "`which iconv.py 2>/dev/null`" -a -n "`which less 2>/dev/null`"
-application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s - | iconv.py -f utf-8 | more; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`" -a -n "`which iconv.py 2>/dev/null`" -a -n "`which more 2>/dev/null`"
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s - | iconv.py -f utf-8 | less; edit=libreoffice %s; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`" -a -n "`which python 2>/dev/null`" -a -n "`which iconv.py 2>/dev/null`" -a -n "`which less 2>/dev/null`"
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s - | iconv.py -f utf-8 | more; needsterminal; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`" -a -n "`which python 2>/dev/null`" -a -n "`which iconv.py 2>/dev/null`" -a -n "`which more 2>/dev/null`"
 application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2txt %s -; copiousoutput; description="M$ Word OOXML Text"; test=test -n "`which docx2txt 2>/dev/null`"
 
 audio/mpeg; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0
@@ -95,8 +95,8 @@ image/x-xpm3; display %s; description="XPM image files"; test=test -n "$DISPLAY"
 image/x-xpm3; sxpm %s; description="XPM image files"; test=test -n "$DISPLAY" -a -n "`which sxpm 2>/dev/null`"
 image/*; xli %s; description="Image files"; test=test -n "$DISPLAY" -a -n "`which xli 2>/dev/null`"
 
-text/html; webbrowserX -t "file://`abspath.py %s`"; description="HTML Text"; test=test -n "$DISPLAY"
-text/html; webbrowser -t "file://`abspath.py %s`"; needsterminal; description="HTML Text"
+text/html; webbrowserX -t "file://`abspath.py %s`"; description="HTML Text"; test=test -n "$DISPLAY" -a -n "`which python 2>/dev/null`" -a -n "`which abspath.py 2>/dev/null`"
+text/html; webbrowser -t "file://`abspath.py %s`"; needsterminal; description="HTML Text" -a -n "`which python 2>/dev/null`" -a -n "`which abspath.py 2>/dev/null`"
 text/html; webdump %s; copiousoutput; description="HTML Text"; test=test -n "`which elinks 2>/dev/null`"
 text/html; webdump2 %s; copiousoutput; description="HTML Text"; test=test -n "`which links2 2>/dev/null`"
 text/html; xlinks2 -force-html %s; description="HTML Text"; test=test -n "$DISPLAY" -a -n "`which links2 2>/dev/null`"