JRUBY-4265: Using -J (to set a Java option) clobbers the CLASSPATH

vvs · vvs · commit 421290d19f24 · 2009-11-29T16:24:21.000+01:00
Identical patches by David Calavera and me. ;)

Note: This is a regression, caused by fix for JRUBY-3800.
diff --git a/bin/jruby b/bin/jruby
@@ -171,9 +171,11 @@ do
             exit
         elif [ "${val}" = "-classpath" ]; then
             CP="$CP$CP_DELIMITER$2"
+            CLASSPATH=""
             shift
         elif [ "${val}" = "-cp" ]; then
             CP="$CP$CP_DELIMITER$2"
+            CLASSPATH=""
             shift
         else
             if [ "${val:0:3}" = "-ea" ]; then
@@ -183,9 +185,6 @@ do
             fi
             java_args=("${java_args[@]}" "${1:2}")
         fi
-        if [ "$CP" != "" ]; then
-          CLASSPATH=""
-        fi
         ;;
      # Match switches that take an argument
      -C|-e|-I|-S) ruby_args=("${ruby_args[@]}" "$1" "$2"); shift ;;
