[java-sig-commits] [javapackages] Cleanup set_classpath() function

[Mikolaj Izdebski]

commit 22a473ceec01f09d968eed83dcba6c2868f38605
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Sep 17 08:14:13 2013 +0200

    Cleanup set_classpath() function

 java-utils/java-functions |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/java-utils/java-functions b/java-utils/java-functions
index a2cddc6..cf3b4ee 100644
--- a/java-utils/java-functions
+++ b/java-utils/java-functions
@@ -135,17 +135,18 @@ set_jvm()
 
 # Set the classpath
 # This requires a valid JAVA_HOME, JAVACMD, and JAVA_LIBDIR
-set_classpath() {
-  _set_java_home
+set_classpath()
+{
+    local IFS
 
-  # get local classpath first
-  jars=$@
-  if [ -n "$ADDITIONAL_JARS" ] ; then
-      jars="$jars $ADDITIONAL_JARS"
-  fi
-  LOCAL_CLASSPATH=$("%{bindir}/build-classpath" $jars)
-  # append original classpath if defined
-  CLASSPATH=$LOCAL_CLASSPATH:$CLASSPATH
+    _set_java_home
+
+    # get local classpath first
+    set -- ${@} ${ADDITIONAL_JARS}
+    LOCAL_CLASSPATH=$("%{bindir}/build-classpath" ${@})
+
+    # append original classpath if defined
+    CLASSPATH=${LOCAL_CLASSPATH}${CLASSPATH:=:}${CLASSPATH}
 }
 
 set_javacmd() {