--- ocaml-rebuild.sh.orig	2008-06-05 16:55:51.000000000 +0200
+++ ocaml-rebuild.sh	2008-06-05 17:01:24.000000000 +0200
@@ -3,19 +3,21 @@
 
 emerge=/usr/bin/emerge
 
-if [ "$1" = "-h" ]
+typeset -i pretend
+
+if [ "${1}" = "-h" ]
 then
 	echo "usage: ocaml-rebuild.sh [-h | -f(orce)] [emerge_options]"
 	echo "With -f, 	the packages will first be unmerged and then emerged"
-	echo "with the given options to ensuree correct dependancy analysis."
+	echo "with the given options to ensure correct dependency analysis."
 	echo "Otherwise emerge is run with the --pretend flag and the given"
 	echo "options."
 	echo "It is recommended to keep the list of rebuilt packages printed"
-	echo "in pretend mode in case something go wrong"
+	echo "in pretend mode in case something goes wrong"
 	exit 1
 fi
 
-if [ "$1" = "-f" ]
+if [ "${1}" = "-f" ]
 then
 	pretend=0
 	shift
@@ -23,39 +25,39 @@
 	pretend=1
 fi
 
-depends=`find /var/db/pkg -name DEPEND -exec grep -l 'dev-lang/ocaml\\|dev-ml/findlib' {} \;`
+depends=$(find /var/db/pkg -name DEPEND -exec grep -l 'dev-lang/ocaml\\|dev-ml/findlib' {} \;)
 
-for dep in $depends
+for dep in ${depends}
 do 
-  dir=`dirname $dep`
-  pkg=`basename $dir`
-  category=`cat $dir/CATEGORY`
-  slot=`cat $dir/SLOT`
+  dir=$(dirname ${dep})
+  pkg=$(basename ${dir})
+  category=$(cat ${dir}/CATEGORY)
+  typeset -i slot=$(cat ${dir}/SLOT)
 
-  toclean="=$category/$pkg $toclean"
-  tocleanstr="\"$category/$pkg\" $tocleanstr"
+  toclean="=${category}/${pkg} ${toclean}"
+  tocleanstr="\"${category}/${pkg}\" ${tocleanstr}"
 
-  if [ $slot -eq 0 ]
+  if [ ${slot} -eq 0 ]
   then
-	tobuild=">=$category/$pkg $tobuild"
-	tobuildstr="\">=$category/$pkg\" $tobuildstr"
+	tobuild=">=${category}/${pkg} ${tobuild}"
+	tobuildstr="\">=${category}/${pkg}\" ${tobuildstr}"
   else
-  	tobuild="=$category/$pkg $tobuild"
-	tobuildstr="\"=$category/$pkg\" $tobuildstr"
+  	tobuild="=${category}/${pkg} ${tobuild}"
+	tobuildstr="\"=${category}/${pkg}\" ${tobuildstr}"
   fi
 done
 
-echo Cleaning $tocleanstr
-echo Building $tobuildstr
+echo Cleaning ${tocleanstr}
+echo Building ${tobuildstr}
 
-if [ "$toclean" != "" ]
+if [ "${toclean}" != "" ]
 then
-	if [ $pretend -eq 1 ]
+	if [ ${pretend} -eq 1 ]
 	then
-		$emerge --pretend $@ $tobuild
+		${emerge} --pretend $@ ${tobuild}
 	else
-		$emerge --unmerge $toclean
-		$emerge $@ $tobuild
+		${emerge} --unmerge ${toclean}
+		${emerge} $@ ${tobuild}
 	fi
 else
 	echo "Nothing to update"