Merge commit '8206fbf', due to my screwup of committing it on a detached

[nmh] / etc / mhn.defaults.sh

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index 1bae840560f76c3b2f4ffab2310312473e85bfd9..d9d35b00f496117395c41a69750b593c42033c8b 100755 (executable)
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -25,19 +25,19 @@ fi
 TMP=/tmp/nmh_temp.$$
 trap "rm -f $TMP" 0 1 2 3 13 15
 
 TMP=/tmp/nmh_temp.$$
 trap "rm -f $TMP" 0 1 2 3 13 15
 

-PGM="`$SEARCHPROG $SEARCHPATH w3m`"
+PGM=`$SEARCHPROG "$SEARCHPATH" w3m`

 if [ ! -z "$PGM" ]; then
     echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\
 $PGM "'-dump ${charset:+-I "$charset"} -O utf-8 -T text/html %F' >> $TMP
 else
 if [ ! -z "$PGM" ]; then
     echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\
 $PGM "'-dump ${charset:+-I "$charset"} -O utf-8 -T text/html %F' >> $TMP
 else

-    PGM="`$SEARCHPROG $SEARCHPATH lynx`"
+    PGM=`$SEARCHPROG "$SEARCHPATH" lynx`

     if [ ! -z "$PGM" ]; then
         #### lynx indents with 3 spaces, remove them and any trailing spaces.
         echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\
 $PGM "'-child -dump -force_html ${charset:+--assume_charset "$charset"} %F | '"\
 expand | sed -e 's/^   //' -e 's/  *$//'" >> $TMP
     else
     if [ ! -z "$PGM" ]; then
         #### lynx indents with 3 spaces, remove them and any trailing spaces.
         echo 'mhfixmsg-format-text/html: charset=%{charset}; '"\
 $PGM "'-child -dump -force_html ${charset:+--assume_charset "$charset"} %F | '"\
 expand | sed -e 's/^   //' -e 's/  *$//'" >> $TMP
     else

-        PGM="`$SEARCHPROG $SEARCHPATH elinks`"
+        PGM=`$SEARCHPROG "$SEARCHPATH" elinks`

         if [ ! -z "$PGM" ]; then
           echo "mhfixmsg-format-text/html: $PGM -dump -force-html \
 -no-numbering -eval 'set document.browse.margin_width = 0' %F" >> $TMP
         if [ ! -z "$PGM" ]; then
           echo "mhfixmsg-format-text/html: $PGM -dump -force-html \
 -no-numbering -eval 'set document.browse.margin_width = 0' %F" >> $TMP


@@ -46,62 +46,63 @@ expand | sed -e 's/^   //' -e 's/  *$//'" >> $TMP
 fi
 
 echo "mhstore-store-text: %m%P.txt" >> $TMP
 fi
 
 echo "mhstore-store-text: %m%P.txt" >> $TMP

+echo "mhstore-store-text/html: %m%P.html" >> $TMP

 echo "mhstore-store-text/richtext: %m%P.rt" >> $TMP
 echo "mhstore-store-video/mpeg: %m%P.mpg" >> $TMP
 echo "mhstore-store-application/PostScript: %m%P.ps" >> $TMP
 
 echo "mhstore-store-text/richtext: %m%P.rt" >> $TMP
 echo "mhstore-store-video/mpeg: %m%P.mpg" >> $TMP
 echo "mhstore-store-application/PostScript: %m%P.ps" >> $TMP
 

-PGM="`$SEARCHPROG $SEARCHPATH xwud`"
+PGM=`$SEARCHPROG "$SEARCHPATH" xwud`

 if [ ! -z "$PGM" ]; then
     XWUD="$PGM" X11DIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/
 else
     XWUD= X11DIR=
 fi
 
 if [ ! -z "$PGM" ]; then
     XWUD="$PGM" X11DIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/
 else
     XWUD= X11DIR=
 fi
 

-PGM="`$SEARCHPROG $SEARCHPATH pnmtoxwd`"
+PGM=`$SEARCHPROG "$SEARCHPATH" pnmtoxwd`

 if [ ! -z "$PGM" ]; then
     NETPBM="$PGM" NETPBMDIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/
 else
     NETPBM= NETPBMDIR=
 fi
 
 if [ ! -z "$PGM" ]; then
     NETPBM="$PGM" NETPBMDIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/
 else
     NETPBM= NETPBMDIR=
 fi
 

-PGM="`$SEARCHPROG $SEARCHPATH xv`"
+PGM=`$SEARCHPROG "$SEARCHPATH" xv`

 if [ ! -z "$PGM" ]; then
 if [ ! -z "$PGM" ]; then

-    echo "mhshow-show-image: %p$PGM -geometry =-0+0 %f" >> $TMP
+    echo "mhshow-show-image: %l$PGM -geometry =-0+0 %f" >> $TMP

 elif [ ! -z $"NETPBM" -a ! -z "$XWUD" ]; then
 elif [ ! -z $"NETPBM" -a ! -z "$XWUD" ]; then

-    echo "mhshow-show-image/gif: %p${NETPBMDIR}giftopnm | ${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-pnm: %p${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-pgm: %p${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-ppm: %p${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-xwd: %p$XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/gif: %l${NETPBMDIR}giftopnm | ${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/x-pnm: %l${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/x-pgm: %l${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/x-ppm: %l${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/x-xwd: %l$XWUD -geometry =-0+0" >> $TMP

 
 

-    PGM="`$SEARCHPROG $SEARCHPATH djpeg`"
+    PGM=`$SEARCHPROG "$SEARCHPATH" djpeg`

     if [ ! -z "$PGM" ]; then
     if [ ! -z "$PGM" ]; then

-       echo "mhshow-show-image/jpeg: %p$PGM -Pg | ${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+       echo "mhshow-show-image/jpeg: %l$PGM -Pg | ${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP

     fi
 fi
 
 if [ -f "/dev/audioIU" ]; then
     fi
 fi
 
 if [ -f "/dev/audioIU" ]; then

-    PGM="`$SEARCHPROG $SEARCHPATH recorder`"
+    PGM=`$SEARCHPROG "$SEARCHPATH" recorder`

     if [ ! -z "$PGM" ]; then
        echo "mhstore-store-audio/basic: %m%P.au" >> $TMP
         echo "mhbuild-compose-audio/basic: ${AUDIODIR}recorder %f -au -pause > /dev/tty" >> $TMP
     if [ ! -z "$PGM" ]; then
        echo "mhstore-store-audio/basic: %m%P.au" >> $TMP
         echo "mhbuild-compose-audio/basic: ${AUDIODIR}recorder %f -au -pause > /dev/tty" >> $TMP

-        echo "mhshow-show-audio/basic: %p${AUDIODIR}splayer -au" >> $TMP
+        echo "mhshow-show-audio/basic: %l${AUDIODIR}splayer -au" >> $TMP

     fi
 elif [ -f "/dev/audio" ]; then
     fi
 elif [ -f "/dev/audio" ]; then

-    PGM="`$SEARCHPROG $SEARCHPATH raw2audio`"
+    PGM=`$SEARCHPROG "$SEARCHPATH" raw2audio`

     if [ ! -z "$PGM" ]; then
        AUDIODIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/
        echo "mhstore-store-audio/basic: | ${AUDIODIR}raw2audio -e ulaw -s 8000 -c 1 > %m%P.au" >> $TMP
         echo "mhstore-store-audio/x-next: %m%P.au" >> $TMP
     if [ ! -z "$PGM" ]; then
        AUDIODIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/
        echo "mhstore-store-audio/basic: | ${AUDIODIR}raw2audio -e ulaw -s 8000 -c 1 > %m%P.au" >> $TMP
         echo "mhstore-store-audio/x-next: %m%P.au" >> $TMP

-       AUDIOTOOL="`$SEARCHPROG $SEARCHPATH audiotool`"
+       AUDIOTOOL=`$SEARCHPROG "$SEARCHPATH" audiotool`

        if [ ! -z "$AUDIOTOOL" ]; then
            echo "mhbuild-compose-audio/basic: $AUDIOTOOL %f && ${AUDIODIR}raw2audio -F < %f" >> $TMP
        else
            echo "mhbuild-compose-audio/basic: trap \"exit 0\" 2 && ${AUDIODIR}record | ${AUDIODIR}raw2audio -F" >> $TMP
        fi
        if [ ! -z "$AUDIOTOOL" ]; then
            echo "mhbuild-compose-audio/basic: $AUDIOTOOL %f && ${AUDIODIR}raw2audio -F < %f" >> $TMP
        else
            echo "mhbuild-compose-audio/basic: trap \"exit 0\" 2 && ${AUDIODIR}record | ${AUDIODIR}raw2audio -F" >> $TMP
        fi

-       echo "mhshow-show-audio/basic: %p${AUDIODIR}raw2audio 2>/dev/null | ${AUDIODIR}play" >> $TMP
+       echo "mhshow-show-audio/basic: %l${AUDIODIR}raw2audio 2>/dev/null | ${AUDIODIR}play" >> $TMP

 
 

-       PGM="`$SEARCHPROG $SEARCHPATH adpcm_enc`"
+       PGM=`$SEARCHPROG "$SEARCHPATH" adpcm_enc`

        if [ ! -z "$PGM" ]; then
            DIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/
            if [ ! -z "$AUDIOTOOL" ]; then
        if [ ! -z "$PGM" ]; then
            DIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/
            if [ ! -z "$AUDIOTOOL" ]; then


@@ -109,69 +110,80 @@ elif [ -f "/dev/audio" ]; then
            else
                echo "mhbuild-compose-audio/x-next: ${AUDIODIR}record | ${DIR}adpcm_enc" >> $TMP
            fi
            else
                echo "mhbuild-compose-audio/x-next: ${AUDIODIR}record | ${DIR}adpcm_enc" >> $TMP
            fi

-           echo "mhshow-show-audio/x-next: %p${DIR}adpcm_dec | ${AUDIODIR}play" >> $TMP
+           echo "mhshow-show-audio/x-next: %l${DIR}adpcm_dec | ${AUDIODIR}play" >> $TMP

        else
            if [ ! -z "$AUDIOTOOL" ]; then
                echo "mhbuild-compose-audio/x-next: $AUDIOTOOL %f" >> $TMP
            else
                echo "mhbuild-compose-audio/x-next: ${AUDIODIR}record" >> $TMP
            fi
        else
            if [ ! -z "$AUDIOTOOL" ]; then
                echo "mhbuild-compose-audio/x-next: $AUDIOTOOL %f" >> $TMP
            else
                echo "mhbuild-compose-audio/x-next: ${AUDIODIR}record" >> $TMP
            fi

-           echo "mhshow-show-audio/x-next: %p${AUDIODIR}play" >> $TMP
+           echo "mhshow-show-audio/x-next: %l${AUDIODIR}play" >> $TMP

        fi
     else
        echo "mhbuild-compose-audio/basic: cat < /dev/audio" >> $TMP
        fi
     else
        echo "mhbuild-compose-audio/basic: cat < /dev/audio" >> $TMP

-        echo "mhshow-show-audio/basic: %pcat > /dev/audio" >> $TMP
+        echo "mhshow-show-audio/basic: %lcat > /dev/audio" >> $TMP

     fi
 fi
 
     fi
 fi
 

-PGM="`$SEARCHPROG $SEARCHPATH mpeg_play`"
+####
+#### mhbuild-disposition-<type>[/<subtype>] entries are used by the
+#### WhatNow attach for deciding whether the Content-Disposition
+#### should be 'attachment' or 'inline'.  Only those values are
+#### supported.
+####
+cat <<EOF >> ${TMP}
+mhbuild-disposition-text/calendar: inline
+mhbuild-disposition-message/rfc822: inline
+EOF
+
+PGM=`$SEARCHPROG "$SEARCHPATH" mpeg_play`

 if [ ! -z "$PGM" ]; then
 if [ ! -z "$PGM" ]; then

-       echo "mhshow-show-video/mpeg: %p$PGM %f" >> $TMP
+       echo "mhshow-show-video/mpeg: %l$PGM %f" >> $TMP

 fi
 
 fi
 

-PGM="`$SEARCHPROG $SEARCHPATH okular`"
+PGM=`$SEARCHPROG "$SEARCHPATH" okular`

 if [ ! -z "$PGM" ]; then
 if [ ! -z "$PGM" ]; then

-    echo "mhshow-show-application/PostScript: %p$PGM %F" >> $TMP
+    echo "mhshow-show-application/PostScript: %l$PGM %F" >> $TMP

 else
 else

-    PGM="`$SEARCHPROG $SEARCHPATH evince`"
+    PGM=`$SEARCHPROG "$SEARCHPATH" evince`

     if [ ! -z "$PGM" ]; then
     if [ ! -z "$PGM" ]; then

-       echo "mhshow-show-application/PostScript: %p$PGM %F" >> $TMP
+       echo "mhshow-show-application/PostScript: %l$PGM %F" >> $TMP

     else
     else

-       PGM="`$SEARCHPROG $SEARCHPATH gv`"
+       PGM=`$SEARCHPROG "$SEARCHPATH" gv`

        if [ ! -z "$PGM" ]; then
        if [ ! -z "$PGM" ]; then

-           echo "mhshow-show-application/PostScript: %p$PGM %F" >> $TMP
+           echo "mhshow-show-application/PostScript: %l$PGM %F" >> $TMP

        fi
     fi
 fi
 
        fi
     fi
 fi
 

-PGM="`$SEARCHPROG $SEARCHPATH acroread`"
+PGM=`$SEARCHPROG "$SEARCHPATH" acroread`

 if [ ! -z "$PGM" ]; then
 if [ ! -z "$PGM" ]; then

-    echo "mhshow-show-application/pdf: %p$PGM %F" >> $TMP
+    echo "mhshow-show-application/pdf: %l$PGM %F" >> $TMP

 else
 else

-    PGM="`$SEARCHPROG $SEARCHPATH okular`"
+    PGM=`$SEARCHPROG "$SEARCHPATH" okular`

     if [ ! -z "$PGM" ]; then
     if [ ! -z "$PGM" ]; then

-       echo "mhshow-show-application/pdf: %p$PGM %F" >> $TMP
+       echo "mhshow-show-application/pdf: %l$PGM %F" >> $TMP

     else
     else

-       PGM="`$SEARCHPROG $SEARCHPATH evince`"
+       PGM=`$SEARCHPROG "$SEARCHPATH" evince`

        if [ ! -z "$PGM" ]; then
        if [ ! -z "$PGM" ]; then

-           echo "mhshow-show-application/pdf: %p$PGM %F" >> $TMP
+           echo "mhshow-show-application/pdf: %l$PGM %F" >> $TMP

         else
         else

-           PGM="`$SEARCHPROG $SEARCHPATH xpdf`"
+           PGM=`$SEARCHPROG "$SEARCHPATH" xpdf`

            if [ ! -z "$PGM" ]; then
            if [ ! -z "$PGM" ]; then

-               echo "mhshow-show-application/pdf: %p$PGM %F" >> $TMP
+               echo "mhshow-show-application/pdf: %l$PGM %F" >> $TMP

             else
             else

-               PGM="`$SEARCHPROG $SEARCHPATH gv`"
+               PGM=`$SEARCHPROG "$SEARCHPATH" gv`

                if [ ! -z "$PGM" ]; then
                if [ ! -z "$PGM" ]; then

-                   echo "mhshow-show-application/pdf: %p$PGM %F" >> $TMP
+                   echo "mhshow-show-application/pdf: %l$PGM %F" >> $TMP

                fi
            fi
        fi
     fi
 fi
 
                fi
            fi
        fi
     fi
 fi
 

-PGM="`$SEARCHPROG $SEARCHPATH ivs_replay`"
+PGM=`$SEARCHPROG "$SEARCHPATH" ivs_replay`

 if [ ! -z "$PGM" ]; then
 if [ ! -z "$PGM" ]; then

-       echo "mhshow-show-application/x-ivs: %p$PGM -o %F" >> $TMP
+       echo "mhshow-show-application/x-ivs: %l$PGM -o %F" >> $TMP

 fi
 
 # The application/vnd.openxmlformats-officedocument.wordprocessingml.document
 fi
 
 # The application/vnd.openxmlformats-officedocument.wordprocessingml.document


@@ -267,40 +279,54 @@ EOF
 # but only once I've added a new %-escape that makes more permanent temp files,
 # so netscape -remote can be used (without -remote you get a complaint dialog
 # that another netscape is already running and certain things can't be done).
 # but only once I've added a new %-escape that makes more permanent temp files,
 # so netscape -remote can be used (without -remote you get a complaint dialog
 # that another netscape is already running and certain things can't be done).

-PGM="`$SEARCHPROG $SEARCHPATH w3m`"
+PGM=`$SEARCHPROG "$SEARCHPATH" w3m`

 if [ ! -z "$PGM" ]; then
     echo 'mhshow-show-text/html: charset=%{charset}; '"\
 if [ ! -z "$PGM" ]; then
     echo 'mhshow-show-text/html: charset=%{charset}; '"\

-%p$PGM"' ${charset:+-I "$charset"} -T text/html %F' >> $TMP
+%l$PGM"' -dump ${charset:+-I "$charset"} -T text/html %F' >> $TMP

 else
 else

-    PGM="`$SEARCHPROG $SEARCHPATH lynx`"
+    PGM=`$SEARCHPROG "$SEARCHPATH" lynx`

     if [ ! -z "$PGM" ]; then
        echo 'mhshow-show-text/html: charset=%{charset}; '"\
     if [ ! -z "$PGM" ]; then
        echo 'mhshow-show-text/html: charset=%{charset}; '"\

-%p$PGM"' -force-html ${charset:+--assume_charset "$charset"} %F' >> $TMP
+%l$PGM"' -child -dump -force-html ${charset:+--assume_charset "$charset"} %F' >> $TMP

     else
     else

-      PGM="`$SEARCHPROG $SEARCHPATH elinks`"
+      PGM=`$SEARCHPROG "$SEARCHPATH" elinks`

       if [ ! -z "$PGM" ]; then
       if [ ! -z "$PGM" ]; then

-          echo "mhshow-show-text/html: $PGM -force-html \
+          echo "mhshow-show-text/html: $PGM -dump -force-html \

 -eval 'set document.browse.margin_width = 0' %F" >> $TMP
       fi
     fi
 fi
 
 -eval 'set document.browse.margin_width = 0' %F" >> $TMP
       fi
     fi
 fi
 

-PGM="`$SEARCHPROG $SEARCHPATH richtext`"
+PGM=`$SEARCHPROG "$SEARCHPATH" richtext`

 if [ ! -z "$PGM" ]; then
 if [ ! -z "$PGM" ]; then

-       echo "mhshow-show-text/richtext: %p$PGM -p %F" >> $TMP
+       echo "mhshow-show-text/richtext: %l$PGM -p %F" >> $TMP

 else
 else

-    PGM="`$SEARCHPROG $SEARCHPATH rt2raw`"
+    PGM=`$SEARCHPROG "$SEARCHPATH" rt2raw`

     if [ ! -z "$PGM" ]; then
     if [ ! -z "$PGM" ]; then

-       echo "mhshow-show-text/richtext: %p$PGM < %f | fmt -78 | more" >> $TMP
+       echo "mhshow-show-text/richtext: %l$PGM < %f | fmt -78 | more" >> $TMP

     fi
 fi
 
 # staroffice to read .doc files
     fi
 fi
 
 # staroffice to read .doc files

-PGM="`$SEARCHPROG $SEARCHPATH soffice`"
+PGM=`$SEARCHPROG "$SEARCHPATH" soffice`

 if [ ! -z "$PGM" ]; then
 if [ ! -z "$PGM" ]; then

-       echo "mhshow-show-application/msword: %p$PGM %F" >> $TMP
+       echo "mhshow-show-application/msword: %l$PGM %F" >> $TMP

 fi
 
 fi
 

+# This entry is used to retrieve external-body types that use a "url"
+# access-type.
+case "`uname`" in
+  FreeBSD)
+       echo "nmh-access-url: fetch -o -" >> $TMP
+       ;;
+  *)
+       PGM=`$SEARCHPROG "$SEARCHPATH" curl`
+       if [ ! -z "$PGM" ]; then
+               echo "nmh-access-url: $PGM -L" >> $TMP
+       fi
+       ;;
+esac
+

 # output a sorted version of the file
 sort < $TMP
 
 # output a sorted version of the file
 sort < $TMP
 


@@ -317,7 +343,7 @@ exit 0
 
 : have to experiment more with this
 
 
 : have to experiment more with this
 

-PGM="`$SEARCHPROG $SEARCHPATH ivs_record`"
+PGM=`$SEARCHPROG "$SEARCHPATH" ivs_record`

 if [ ! -z "$PGM" ]; then
        echo "mhbuild-compose-application/x-ivs: $PGM -u localhost %F" >> $TMP
 fi
 if [ ! -z "$PGM" ]; then
        echo "mhbuild-compose-application/x-ivs: $PGM -u localhost %F" >> $TMP
 fi