X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2Fmhn.defaults.sh;h=5630bcca327d2613a052b1efcf7bd001869c40b2;hp=358baf11250ae1a902bfcd8e97aef5d3f84c632b;hb=e7842917b12445fe042f8b4656e8dde2c3105faf;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index 358baf1..5630bcc 100755
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -77,7 +77,7 @@ elif [ -f "/dev/audio" ]; then
         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
@@ -126,6 +126,15 @@ if [ ! -z "$PGM" ]; then
 	echo "mhshow-show-application/x-ivs: %p$PGM -o '%F'" >> $TMP
 fi
 
+# 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 -force_html '%F'" >> $TMP
+fi
+
 PGM="`$SEARCHPROG $SEARCHPATH richtext`"
 if [ ! -z "$PGM" ]; then
 	echo "mhshow-show-text/richtext: %p$PGM -p '%F'" >> $TMP
@@ -138,7 +147,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