All %-escapes in mhn.defaults that actually expand to something should be

surrounded by single quotes.  Added quotes to the ones in mhn.defaults.sh that
were missing them.

diff --git a/ChangeLog b/ChangeLog
index ccfb331..fd15ad3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 28 14:05:02 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
+
+       * All %-escapes in mhn.defaults that actually expand to something
+       should be surrounded by single quotes.  Added quotes to the ones
+       in mhn.defaults.sh that were missing them.
+
 Thu Jan 27 12:22:25 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
 
        * makedir() had multiple bugs dating back to MH.  It passed an

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index 358baf1..7de7ca6 100755 (executable)
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -27,10 +27,10 @@ fi
 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
+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
@@ -65,7 +65,7 @@ fi
 if [ -f "/dev/audioIU" ]; then
     PGM="`$SEARCHPROG $SEARCHPATH recorder`"
     if [ ! -z "$PGM" ]; then
-       echo "mhstore-store-audio/basic: %m%P.au" >> $TMP
+       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
@@ -73,11 +73,11 @@ 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
+       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
+           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
@@ -87,14 +87,14 @@ elif [ -f "/dev/audio" ]; then
        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
+               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
+               echo "mhbuild-compose-audio/x-next: $AUDIOTOOL '%f'" >> $TMP
            else
                echo "mhbuild-compose-audio/x-next: ${AUDIODIR}record" >> $TMP
            fi
@@ -138,7 +138,7 @@ fi
 
 PGM="`$SEARCHPROG $SEARCHPATH xterm`"
 if [ ! -z "$PGM" ]; then
-       echo "mhshow-charset-iso-8859-1: xterm -fn '-*-*-medium-r-normal-*-*-120-*-*-c-*-iso8859-*' -e %s" >> $TMP
+       echo "mhshow-charset-iso-8859-1: xterm -fn '-*-*-medium-r-normal-*-*-120-*-*-c-*-iso8859-*' -e '%s'" >> $TMP
 fi
 
 # output a sorted version of the file