Properly trim and set properties for RNG and encoding. Fixes #5132

jruby · Apr 12, 2018 · fda229c · fda229c
1 parent d493c94
commit fda229c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/bin/jruby.bash b/bin/jruby.bash
@@ -239,11 +239,12 @@ do
             if [ "${val:0:3}" = "-ea" ]; then
                 VERIFY_JRUBY="yes"
             elif [ "${val:0:16}" = "-Dfile.encoding=" ]; then
-                JAVA_ENCODING=$val
+                JAVA_ENCODING=$val${val:16}
             elif [ "${val:0:20}" = "-Djava.security.egd=" ]; then
-                JAVA_SECURITY_EGD=$val
+                JAVA_SECURITY_EGD=${val:20}
+            else
+                java_args=("${java_args[@]}" "${1:2}")
             fi
-            java_args=("${java_args[@]}" "${1:2}")
         fi
         ;;
      # Pass -X... and -X? search options through
@@ -321,6 +322,8 @@ done
 # Force file.encoding to UTF-8 when on Mac, since Apple JDK defaults to MacRoman (JRUBY-3576)
 if [[ $darwin && -z "$JAVA_ENCODING" ]]; then
   java_args=("${java_args[@]}" "-Dfile.encoding=UTF-8")
+elif [[ -n "$JAVA_ENCODING" ]]; then
+  java_args=("${java_args[@]}" "-Dfile.encoding=$JAVA_ENCODING")
 fi
 
 # Force OpenJDK-based JVMs to use /dev/urandom for random number generation