diff --git a/src/script/ant b/src/script/ant
index 2fd04852f..af8658d5d 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -18,7 +18,7 @@ fi
 
 # load user ant configuration
 if [ -f "$HOME/.antrc" ] ; then 
-  . $HOME/.antrc
+  . "$HOME/.antrc"
 fi
 
 # OS specific support.  $var _must_ be set to either true or false.
@@ -103,7 +103,7 @@ fi
 
 # in rpm_mode get ant/optional/xml parser&api from JAVALIBDIR 
 if $rpm_mode; then
-  JAVALIBDIR="/usr/share/java"
+  JAVALIBDIR=/usr/share/java
   for i in ant ant-optional jaxp_parser xml_apis 
   do
     if [ -z "$LOCALCLASSPATH" ] ; then
@@ -113,9 +113,8 @@ if $rpm_mode; then
     fi
   done
 
-# in rpm mode ant/lib is in /usr/share/java/ant
-ANT_LIB="${JAVALIBDIR}/ant"
-
+  # in rpm mode ant/lib is in /usr/share/java/ant
+  ANT_LIB="${JAVALIBDIR}/ant"
 fi
 
 # add in the dependency .jar files in non-RPM mode (the default)