Fix for ugly things... (#2)

[Andreas Mohr]

Hi all,

this is a resubmission of my previous patch.
Thanks to Francois for telling me to fix it properly !
(I really should have done that anyway)

-- 
Andreas Mohr                        Stauferstr. 6, D-71272 Renningen, Germany
-------------- next part --------------
Determining best CVS host...
Using CVSROOT :pserver:cvs at rhlx01.fht-esslingen.de:/home/wine
Index: documentation/db2html-winehq
===================================================================
RCS file: /home/wine/wine/documentation/db2html-winehq,v
retrieving revision 1.2
diff -u -r1.2 db2html-winehq
--- documentation/db2html-winehq	18 Jan 2001 23:07:53 -0000	1.2
+++ documentation/db2html-winehq	24 Nov 2001 10:37:25 -0000
@@ -90,20 +90,20 @@
 
 if [ $# -eq 1 ]
 then
-  if [ -d ${output}.junk ]
+  if [ -d "${output}.junk" ]
   then
-    /bin/rm -rf ${output}.junk
+    /bin/rm -rf "${output}.junk"
   fi
-  if [ -d ${output} ]
+  if [ -d "${output}" ]
   then
-    mv $output ${output}.junk
+    mv "$output" "${output}.junk"
   fi
   echo "about to rename temporary directory to $output"
-  mv ${TMPDIR} $output
+  mv "${TMPDIR}" "$output"
 else
-  cat $TMPDIR/*
+  cat "$TMPDIR"/*
 fi
 
-rm -rf $TMPDIR
+rm -rf "$TMPDIR"
 
 exit 0
Index: documentation/make_winehq
===================================================================
RCS file: /home/wine/wine/documentation/make_winehq,v
retrieving revision 1.3
diff -u -r1.3 make_winehq
--- documentation/make_winehq	26 Sep 2001 23:02:31 -0000	1.3
+++ documentation/make_winehq	24 Nov 2001 10:37:25 -0000
@@ -20,11 +20,11 @@
 
 WWWDIR=www.winehq.com
 ## Want to put this into a sub-directory for easier maintenance
-if [ -e $WWWDIR ]; then
-  rm -rf $WWWDIR.old
-  mv $WWWDIR $WWWDIR.old
+if [ -e "$WWWDIR" ]; then
+  rm -rf "$WWWDIR.old"
+  mv "$WWWDIR" "$WWWDIR".old
 fi
-mkdir $WWWDIR
+mkdir "$WWWDIR"
 
 ## Create four-book HTML tarball
 echo "./db2html-winehq wine-user.sgml"
@@ -36,13 +36,13 @@
 echo "./db2html-winehq wine-pkg.sgml"
 ./db2html-winehq wine-pkg.sgml
 tar czf winedoc-html.tgz wine-user wine-devel winelib-user wine-pkg
-cp winedoc-html.tgz $WWWDIR
+cp winedoc-html.tgz "$WWWDIR"
 
 ## Create one-book HTML tarball
 echo "./db2html-winehq wine-doc.sgml"
 ./db2html-winehq wine-doc.sgml
 tar czf wine-set-html.tgz wine-doc
-cp wine-set-html.tgz $WWWDIR
+cp wine-set-html.tgz "$WWWDIR"
 
 ## Create PostScript tarball
 echo "db2ps -d ./print.dsl wine-user.sgml"
@@ -54,7 +54,7 @@
 echo "db2ps -d ./print.dsl wine-pkg.sgml"
 db2ps -d ./print.dsl wine-pkg.sgml > /dev/null 2>&1
 tar czf winedoc-ps.tgz wine-user.ps wine-devel.ps winelib-user.ps wine-pkg.ps
-cp winedoc-ps.tgz $WWWDIR
+cp winedoc-ps.tgz "$WWWDIR"
 
 ## Create PDF tarball
 echo "db2pdf -d ./print.dsl wine-user.sgml"
@@ -66,12 +66,12 @@
 echo "db2pdf -d ./print.dsl wine-pkg.sgml"
 db2pdf -d ./print.dsl wine-pkg.sgml > /dev/null 2>&1
 tar czf winedoc-pdf.tgz wine-user.pdf wine-devel.pdf winelib-user.pdf wine-pkg.pdf
-cp winedoc-pdf.tgz $WWWDIR
+cp winedoc-pdf.tgz "$WWWDIR"
 
 ## Create SGML tarball
 echo "Creating SGML package..."
 tar czf winedoc-sgml.tgz *.sgml *.dsl *.ent db2html-winehq
-cp winedoc-sgml.tgz $WWWDIR
+cp winedoc-sgml.tgz "$WWWDIR"
 
 ## Done creating downloadable tarballs for users.  Now we want to
 ## create a tarball of SHTML in a slightly different form, for the
@@ -91,5 +91,5 @@
 echo "./db2html-winehq wine-pkg.sgml"
 ./db2html-winehq wine-pkg.sgml
 tar czf winehq-shtml.tgz wine-user wine-devel winelib-user wine-pkg
-cp winehq-shtml.tgz $WWWDIR
+cp winehq-shtml.tgz "$WWWDIR"
 
Index: tools/font_convert.sh
===================================================================
RCS file: /home/wine/wine/tools/font_convert.sh,v
retrieving revision 1.1
diff -u -r1.1 font_convert.sh
--- tools/font_convert.sh	30 May 2000 20:49:07 -0000	1.1
+++ tools/font_convert.sh	24 Nov 2001 10:37:25 -0000
@@ -70,8 +70,8 @@
 
 if [ -z "$FONTS" ]; then $Q echo "Can't find any fonts in $WIND"; exit 1; fi; 
 
-mkdir $TMPDIR;
-cd $TMPDIR; 
+mkdir "$TMPDIR"
+cd "$TMPDIR"
 
 for i in "${FONTS[@]}"; do 
     FNT=`basename "$i"`; FNT=${FNT%.???};
@@ -89,7 +89,7 @@
     $Q echo "installing ${i%.???}.pcf";
     mv "${i%.???}.pcf" $TARGET 2>/dev/null
     if [ $? -ne 0 ]; then 
-	$Q echo "Can't install fonts to $TARGET. Are your root?"; cd $OLDPWD; rm -rf $TMPDIR; exit 1; fi;
+	$Q echo "Can't install fonts to $TARGET. Are your root?"; cd $OLDPWD; rm -rf "$TMPDIR"; exit 1; fi;
     rm "$i";
 done;
 
@@ -100,7 +100,7 @@
 else
     mkfontdir
 fi;
-rmdir $TMPDIR;
+rmdir "$TMPDIR"
 
 if [ "$DISPLAY" ]; then $Q echo "adjusting X font database"; xset fp rehash; fi;