Make mhn.defaults a static file and removed the scripts that built it.

This concept its likely to change in future anyway.

diff --git a/.gitignore b/.gitignore
index 14c2a07..b5b89d6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@
 /config/version.c
 /docs/Makefile
 /etc/Makefile
-/etc/mhn.defaults
 /h/Makefile
 /man/Makefile
 /man/man.sed

diff --git a/INSTALL b/INSTALL
index d93ff2c..32e6d42 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -50,24 +50,11 @@ need an ANSI C compiler such as gcc.
    that directory to see if you need to merge changes.
 
 4) Edit the file `mhn.defaults' (installed in the mmh `etc' directory).
+
    This file contains the default profile entries for the mmh commands
-   mhlist/mhstore/mhshow and is created by the script `mhn.defaults.sh'.
-   This script will search a generic path (essentially your $PATH) for
-   programs to handle various content types (for example, xv to display
-   images).  You can re-run this script and give it a more tailored
-   path.  You may want to re-run this script later if you install new
-   programs to display content.  An example of this is:
-
-       % cd support/general
-       % ./mhn.defaults.sh /usr/local/bin:/usr/ucb > mhn.defaults
-
-   and then move `mhn.defaults' into the mmh `etc' directory.
-
-   The `mhn.defaults.sh' script only searches for a simple set of programs.
-   If you have specialized programs to handle various types, you will need
-   to edit the `mhn.defaults' file manually.  The syntax of this file is
-   described in section 9.4 of the book "MH & xmh: Email for Users and
-   Programmers", 3rd edition, by Jerry Peek, on the Internet at
+   mhlist/mhstore/mhshow.  The syntax of this file is described in section
+   9.4 of the book "MH & xmh: Email for Users and Programmers", 3rd edition,
+   by Jerry Peek, on the Internet at
    <http://www.ics.uci.edu/~mh/book/mh/confmhn.htm>.
 
 5) Add the bindir to your PATH variable.

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 2d40acf..6584471 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -21,14 +21,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT  = @INSTALL_SCRIPT@
 INSTALL_DATA    = @INSTALL_DATA@
 
-# Path to search for programs to handle MIME
-# content.  Used to create mhn.defaults
-MHNSEARCHPATH = "$(PATH):/usr/demo/SOUND"
-
-# Program used to search path for various programs to
-# handle MIME content.  Used to create mhn.defaults
-MHNSEARCHPROG = $(srcdir)/mhn.find.sh
-
 SED = sed
 
 .SUFFIXES:
@@ -39,54 +31,39 @@ STATIC_FILES = components digestcomps distcomps forwcomps  \
                mhl.reply rcvdistcomps rcvdistcomps.outbox              \
                replcomps replgroupcomps scan.MMDDYY scan.YYYYMMDD      \
                scan.nmh scan.mailx scan.nomime scan.size scan.time \
-               scan.timely scan.unseen
-
-# templates and scripts from which non-static files are generated
-GENERATED_FILE_SRCS = mhn.defaults.sh mhn.find.sh
-
-# non-scripts generated using above GENERATED_FILE_SRCs
-GENERATED_ETC_FILES = mhn.defaults
+               scan.timely scan.unseen mhn.defaults
 
 # auxiliary files (included in distribution but not installed)
 AUX = Makefile.in
 
 # all non-generated files in this directory are included in the distribution
-DIST = $(STATIC_FILES) $(GENERATED_FILE_SRCS) $(AUX)
+DIST = $(STATIC_FILES) $(AUX)
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
-all: $(GENERATED_ETC_FILES)
-
-mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
-       rm -f $@
-       $(srcdir)/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
+all:
 
 install: install-etc-files
 
 install-etc-files:
        mkdir -p $(DESTDIR)$(etcdir)
-       INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
        for file in $(STATIC_FILES); do \
-         INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
-       done; \
-       for path in $$INSTALL_FILES; do \
-         file=`basename $$path`; \
          if [ -f "$(DESTDIR)$(etcdir)/$$file" ]; then \
-           if cmp -s "$$path" "$(DESTDIR)$(etcdir)/$$file" ; then \
+           if cmp -s "$(srcdir)/$$file" "$(DESTDIR)$(etcdir)/$$file" ; then \
              :; \
            else \
-             $(INSTALL_DATA) "$$path" "$(DESTDIR)$(etcdir)/$$file.dist"; \
+             $(INSTALL_DATA) "$(srcdir)/$$file" "$(DESTDIR)$(etcdir)/$$file.dist"; \
              echo "$(DESTDIR)$(etcdir)/$$file has local modifications; installing with .dist suffix"; \
            fi; \
          else \
-           $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
+           $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(etcdir)/$$file; \
          fi; \
        done
 
 uninstall: uninstall-etc-files
 
 uninstall-etc-files:
-       for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
+       for file in $(STATIC_FILES) ; do \
          rm -f $(DESTDIR)$(etcdir)/$$file; \
        done
 
@@ -96,7 +73,6 @@ mostlyclean:
        rm -f *~
 
 clean: mostlyclean
-       rm -f $(GENERATED_ETC_FILES)
 
 distclean: clean
        rm -f Makefile

diff --git a/etc/mhn.defaults b/etc/mhn.defaults
new file mode 100644 (file)
index 0000000..023ad61
--- /dev/null
+++ b/etc/mhn.defaults
@@ -0,0 +1,5 @@
+mhshow-suffix-text/html: .html
+mhstore-store-application/PostScript: %m%P.ps
+mhstore-store-text: %m%P.txt
+mhstore-store-text/richtext: %m%P.rt
+mhstore-store-video/mpeg: %m%P.mpg

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
deleted file mode 100755 (executable)
index 1c798fc..0000000
--- a/etc/mhn.defaults.sh
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/bin/sh
-#
-# mhn.defaults.sh -- create extra profile file for MIME handling
-#
-# USAGE: mhn.defaults.sh [ search-path [ search-prog ]]
-
-# If a search path is passed to the script, we
-# use that, else we use a default search path.
-if [ -n "$1" ]; then
-    SEARCHPATH=$1
-else
-    SEARCHPATH="$PATH:/usr/demo/SOUND"
-fi
-
-# If a search program is passed to the script, we
-# use that, else we use a default search program.
-if [ -n "$2" ]; then
-    SEARCHPROG=$2
-else
-    SEARCHPROG="mhn.find.sh"
-fi
-
-# put output into a temporary file, so we
-# can sort it before output.
-TMP=/tmp/nmh_temp.$$
-trap "rm -f $TMP" 0 1 2 3 13 15
-
-echo "mhstore-store-text: %m%P.txt" >> $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`"
-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 pbmtoxwd`"
-if [ ! -z "$PGM" ]; then
-    PBM="$PGM" PBMDIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/
-else
-    PBM= PBMDIR=
-fi
-
-PGM="`$SEARCHPROG $SEARCHPATH xv`"
-if [ ! -z "$PGM" ]; then
-    echo "mhshow-show-image: %p$PGM -geometry =-0+0 '%f'" >> $TMP
-elif [ ! -z $"PBM" -a ! -z "$XWUD" ]; then
-    echo "mhshow-show-image/gif: %p${PBMDIR}giftoppm | ${PBMDIR}ppmtopgm | ${PBMDIR}pgmtopbm | ${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-pbm: %p${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-pgm: %p${PBMDIR}pgmtopbm | ${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-ppm: %p${PBMDIR}ppmtopgm | ${PBMDIR}pgmtopbm | ${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-xwd: %p$XWUD -geometry =-0+0" >> $TMP
-
-    PGM="`$SEARCHPROG $SEARCHPATH djpeg`"
-    if [ ! -z "$PGM" ]; then
-        echo "mhshow-show-image/jpeg: %p$PGM -Pg | ${PBMDIR}ppmtopgm | ${PBMDIR}pgmtopbm | ${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    fi
-fi
-
-if [ -f "/dev/audioIU" ]; then
-    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
-        echo "mhshow-show-audio/basic: %p${AUDIODIR}splayer -au" >> $TMP
-    fi
-elif [ -f "/dev/audio" ]; then
-    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
-        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
-        echo "mhshow-show-audio/basic: %p${AUDIODIR}raw2audio 2>/dev/null | ${AUDIODIR}play" >> $TMP
-
-        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
-                echo "mhbuild-compose-audio/x-next: $AUDIOTOOL '%f' && ${DIR}adpcm_enc < '%f'" >> $TMP
-            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
-        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
-        fi
-    else
-        echo "mhbuild-compose-audio/basic: cat < /dev/audio" >> $TMP
-        echo "mhshow-show-audio/basic: %pcat > /dev/audio" >> $TMP
-    fi
-fi
-
-PGM="`$SEARCHPROG $SEARCHPATH mpeg_play`"
-if [ ! -z "$PGM" ]; then
-        echo "mhshow-show-video/mpeg: %p$PGM '%f'" >> $TMP
-fi
-
-PGM="`$SEARCHPROG $SEARCHPATH lpr`"
-if [ ! -z "$PGM" ]; then
-        echo "mhshow-show-application/PostScript: %plpr -Pps" >> $TMP
-else
-    PGM="`$SEARCHPROG $SEARCHPATH lp`"
-    if [ ! -z "$PGM" ]; then
-        echo "mhshow-show-application/PostScript: %plp -dps" >> $TMP
-    fi
-fi
-
-PGM="`$SEARCHPROG $SEARCHPATH ivs_replay`"
-if [ ! -z "$PGM" ]; then
-        echo "mhshow-show-application/x-ivs: %p$PGM -o '%F'" >> $TMP
-fi
-
-echo "mhshow-suffix-text/html: .html" >> $TMP
-
-# I'd like to check if netscape is available and use it preferentially to lynx,
-# 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 lynx`"
-if [ ! -z "$PGM" ]; then
-        echo "mhshow-show-text/html: %p$PGM '%F'" >> $TMP
-fi
-
-PGM="`$SEARCHPROG $SEARCHPATH richtext`"
-if [ ! -z "$PGM" ]; then
-        echo "mhshow-show-text/richtext: %p$PGM -p '%F'" >> $TMP
-else
-    PGM="`$SEARCHPROG $SEARCHPATH rt2raw`"
-    if [ ! -z "$PGM" ]; then
-        echo "mhshow-show-text/richtext: %p$PGM < '%f' | fmt -78 | more" >> $TMP
-    fi
-fi
-
-# staroffice to read .doc files
-PGM="`$SEARCHPROG $SEARCHPATH soffice`"
-if [ ! -z "$PGM" ]; then
-        echo "mhshow-show-application/msword: %psoffice '%F'" >> $TMP
-        echo "mhshow-suffix-application/msword: .doc" >> $TMP
-fi
-
-# output a sorted version of the file
-sort < $TMP
-
-exit 0
-
-: not until we get a "safe" postscript environment...
-
-PGM="`$SEARCHPROG $SEARCHPATH pageview`"
-if [ "$DISPLAY" = "unix:0.0" -a ! -z "$PGM" ]; then
-    echo "mhshow-show-application/PostScript: %p$PGM -" >> $TMP
-else
-    PGM="`$SEARCHPROG $SEARCHPATH gs`"
-    if [ ! -z "$PGM" ]; then
-        echo "mhshow-show-application/PostScript: %p$PGM -- '%F'" >> $TMP
-        echo "mhshow-suffix-application/PostScript: .ps" >> $TMP
-    fi
-fi
-
-: have to experiment more with this
-
-PGM="`$SEARCHPROG $SEARCHPATH ivs_record`"
-if [ ! -z "$PGM" ]; then
-        echo "mhbuild-compose-application/x-ivs: $PGM -u localhost '%F'" >> $TMP
-fi

diff --git a/etc/mhn.find.sh b/etc/mhn.find.sh
deleted file mode 100755 (executable)
index 4b4230d..0000000
--- a/etc/mhn.find.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-#
-# mhn.find.sh -- check if a particular command is available
-#
-
-if test -z "$2"; then
-    echo "usage: mhn.find.sh search-path program" 1>&2
-    exit 1
-fi
-
-# PATH to search for programs
-SEARCHPATH=$1
-
-# program to search for
-PROGRAM=$2
-
-PGM= oIFS="$IFS" IFS=":"
-for A in $SEARCHPATH; do
-
-    # skip the directories `.' and `..'
-    if test "$A" = "." -o "$A" = ".."; then
-        continue
-    fi
-
-    # if program was found in /usr/local/bin, then
-    # just echo program name, else echo full pathname
-    if test -f "$A/$PROGRAM"; then
-        if test "$A" = "/usr/local/bin"; then
-            PGM="$PROGRAM"
-        else
-            PGM="$A/$PROGRAM"
-        fi
-
-        echo "$PGM"
-        exit 0
-    fi
-done
-IFS="$oIFS"
-