Skip to content

jruby.sh: Use array to handle option files #8442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
headius merged 1 commit into from
Nov 27, 2024
Merged

jruby.sh: Use array to handle option files #8442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions bin/jruby.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,24 +174,24 @@ add_log() {

# Logic to process "arguments files" on both Java 8 and Java 9+
process_java_opts() {
local java_opts_file="$1" java_opts=
local java_opts_file="$1"
if [ -r "$java_opts_file" ]; then
add_log
add_log "Adding Java options from: $java_opts_file"

while read -r line; do
if [ "$line" ]; then
java_opts="${java_opts} ${line}"
add_log " $line"
fi
done < "$java_opts_file"

# On Java 9+, add an @argument for the given file.
# On earlier versions the file contents will be read and expanded on the Java command line.
if $use_modules; then
java_opts_from_files="$java_opts_from_files @$java_opts_file"
append java_opts_from_files "@$java_opts_file"
else
java_opts_from_files="$java_opts_from_files $java_opts"
local line=
while read -r line; do
if [ "$line" ]; then
# shellcheck disable=2086 # Split options on whitespace
append java_opts_from_files $line
add_log " $line"
fi
done < "$java_opts_file"
fi
fi
}
Expand Down Expand Up @@ -685,12 +685,14 @@ fi

# ----- Final prepration of the Java command line -----------------------------

# Include all options from files at the beginning of the Java command line
JAVA_OPTS="$java_opts_from_files $JAVA_OPTS"

# Don't quote JAVA_OPTS; we want it to expand
# shellcheck disable=2086
prepend java_args "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS"
prepend java_args $JAVA_OPTS "$JFFI_OPTS"

# Include all options from files at the beginning of the Java command line
preextend java_args java_opts_from_files

prepend java_args "$JAVACMD"

if $NO_BOOTCLASSPATH || $VERIFY_JRUBY; then
if $use_modules; then
Expand Down