--- ./wvMime.tmp-filename	2004-05-14 07:18:23.000000000 +0200
+++ ./wvMime	2004-05-14 08:18:18.000000000 +0200
@@ -42,34 +42,37 @@
 
 # temporary PS file, mangled to get some sort
 # of semi-uniqueness
-FILE=`basename ${1}`
-TMPDIR="/tmp/${FILE}-${USER}-${$}"
-TMPPS="$TMPDIR/${FILE}-${USER}-${$}.ps" 
-
-mkdir $TMPDIR
+FILE="`basename "${1}"`"
+TMPDIR=$(mktemp -d /tmp/wvMime.XXXXXXXX) || { echo "$0: can not create temporary directory" >& 2; exit 1; }
+TMPPS="$TMPDIR/tmp.ps"
+TMPFILE="$TMPDIR/tmpfile"
+TMPTEX="$TMPDIR/tmp.tex"
+#TMPPS="$TMPDIR/${FILE}-${USER}-${$}.ps" 
 
 # Make sure all graphics go into /tmp as well
-cp ${1} $TMPDIR/$FILE
+cp "${1}" "$TMPFILE"
 
 # Extract graphics
-wvLatex "$TMPDIR/$FILE" "$TMPDIR/$FILE.tex" 2>/dev/null >/dev/null
+wvLatex "$TMPFILE" "$TMPTEX" 2>/dev/null >/dev/null
 
 # Graphics conversion if make_epses.sh installed:
-STEM=$TMPDIR/`basename ${1} .doc`
-type make_epses.sh 2>&1 >/dev/null
-  if [ ${?} -eq "0" ]; then
-    (cd $TMPDIR; make_epses.sh $STEM)
-  fi
+#STEM=$TMPDIR/"`basename "${1}" .doc`"
+#type make_epses.sh >/dev/null 2>&1 
+#  if [ ${?} -eq "0" ]; then
+#    (cd $TMPDIR; make_epses.sh $STEM)
+#  fi
 
-wvPS $TMPDIR/$FILE ${TMPPS}
+cd $TMPDIR
+wvPS `basename $TMPFILE` `basename ${TMPPS}`
 if [ ${?} -ne "0" ]; then 
 	echo "Could not translate into Postscript" 
+	rm -rf $TMPDIR
 	exit 1 
 fi 
 
 # call our ghost-viewer
-${GV} ${TMPPS}
-rm -f ${TMPPS}
+${GV} "${TMPPS}"
+rm -f "${TMPPS}"
 
 cd /
 rm -rf $TMPDIR