Skip to content

Commit 131ba02

Browse files
headiusheadius
committedFeb 13, 2018
Merge branch 'jruby-9.1' into improve_windows_open3
2 parents f58ddad + cd56bd7 commit 131ba02

File tree

103 files changed

+1510
-928
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1510
-928
lines changed
 

‎.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,10 @@ notifications:
117117

118118
services:
119119
- redis-server
120+
- haveged
120121

121122
addons:
122123
apt:
123124
packages:
124125
- oracle-java9-installer
126+
- haveged

‎bin/jruby.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ do
244244
# Match -Xa.b.c=d to translate to -Da.b.c=d as a java option
245245
-X*)
246246
val=${1:2}
247-
if expr "$val" : '.*[.]' > /dev/null; then
247+
if expr -- "$val" : '.*[.]' > /dev/null; then
248248
java_args=("${java_args[@]}" "-Djruby.${val}")
249249
else
250250
ruby_args=("${ruby_args[@]}" "-X${val}")

0 commit comments

Comments
 (0)