mirror of
https://git.freebsd.org/ports.git
synced 2025-06-20 12:10:31 -04:00
6b9845615d
- Backport fix for plugin *updates* that upstream hasn't released yet - Fix an expr syntax error which was really from upstream jruby; logstash doesn't ship with a new enough jruby that includes this fix yet
24 lines
838 B
Bash
24 lines
838 B
Bash
--- vendor/jruby/bin/jruby.sh.orig 2018-02-16 20:50:22 UTC
|
|
+++ vendor/jruby/bin/jruby.sh
|
|
@@ -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}"
|