[groovy/f19] Merge f18 into origin/f19

[Matt Spaulding]

commit d26018741d2f0f11fc06717f86d370f262de53af
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Sat Aug 17 21:17:00 2013 -0700

    Merge f18 into origin/f19

 groovy-script |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/groovy-script b/groovy-script
index 1f685f0..c79f8ab 100644
--- a/groovy-script
+++ b/groovy-script
@@ -76,7 +76,11 @@ BASE_JARS="$BASE_JARS xstream"
 BASE_JARS="$BASE_JARS jansi"
 
 if [ "$1" = "-cp" -o "$1" = "-classpath" -o "$1" = "--classpath" ] ; then
-    ADDITIONAL_JARS="$(echo $2 | tr ':' ' ')"
+    if [ -z $CLASSPATH ]; then
+        CLASSPATH=$2
+    else
+        CLASSPATH=$2:$CLASSPATH
+    fi
     shift 2
 fi