Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 63821af4c85b
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9a9d63e0b539
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 26, 2018

  1. fix issue where expr fails on freebsd. 

    These scripts produce errors when run on FreeBSD (in the context of logstash). Adding the double dash prevents interpretation of the left operand as an option to expr itself. See also https://discuss.elastic.co/t/cannot-install-multiline-filter-on-freebsd-11/106929?source_topic_id=117201.
    @arjanvandervelde
    arjanvandervelde committed Jan 26, 2018
    Copy the full SHA
    b617d55 View commit details

Commits on Jan 29, 2018

  1. Merge pull request #5013 from arjanvandervelde/master 

    fix issue where expr fails on freebsd.
    @enebo
    enebo authored Jan 29, 2018
    Copy the full SHA
    9a9d63e View commit details
Showing with 5 additions and 5 deletions.
  1. +1 −1 bin/jruby.bash
  2. +4 −4 bin/jruby.sh
2 changes: 1 addition & 1 deletion bin/jruby.bash
View file
Original file line number Diff line number Diff line change
@@ -244,7 +244,7 @@ do
# Match -Xa.b.c=d to translate to -Da.b.c=d as a java option
-X*)
val=${1:2}
if expr "$val" : '.*[.]' > /dev/null; then
if expr -- "$val" : '.*[.]' > /dev/null; then
java_args=("${java_args[@]}" "-Djruby.${val}")
else
ruby_args=("${ruby_args[@]}" "-X${val}")
8 changes: 4 additions & 4 deletions bin/jruby.sh
View file
Original file line number Diff line number Diff line change
@@ -26,9 +26,9 @@ progname=`basename "$0"`

while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '.*/.*' > /dev/null; then
if expr "$link" : '/' > /dev/null; then
link=`expr -- "$ls" : '.*-> \(.*\)$'`
if expr -- "$link" : '.*/.*' > /dev/null; then
if expr -- "$link" : '/' > /dev/null; then
PRG="$link"
else
PRG="`dirname ${PRG}`/${link}"
@@ -202,7 +202,7 @@ do
# Match -Xa.b.c=d to translate to -Da.b.c=d as a java option
-X*)
val=${1:2}
if expr "$val" : '.*[.]' > /dev/null; then
if expr -- "$val" : '.*[.]' > /dev/null; then
java_args="${java_args} -Djruby.${val}"
else
ruby_args="${ruby_args} -X${val}"