Skip to content

Simplify classpath flag calculation #7

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
Mar 1, 2026
Merged

Simplify classpath flag calculation #7

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
20 changes: 8 additions & 12 deletions bin/jruby.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,26 +997,22 @@ fi

prepend java_args "$JAVACMD"

classpath_value=$CLASSPATH
if $NO_BOOTCLASSPATH || $VERIFY_JRUBY; then
if $use_modules; then
# Use module path instead of classpath for the jruby libs
append java_args --module-path "$JRUBY_CP"
if [ -n "$CLASSPATH" ]; then
append java_args -classpath "$CLASSPATH"
fi
else
if [ -n "$CLASSPATH" ]; then
append java_args -classpath "$JRUBY_CP$CP_DELIMITER$CLASSPATH"
else
append java_args -classpath "$JRUBY_CP"
fi
classpath_value="$JRUBY_CP$CP_DELIMITER$classpath_value"
# Trim extra delimiter we might have appended
classpath_value="${classpath_value%"$CP_DELIMITER"}"
fi
else
append java_args -Xbootclasspath/a:"$JRUBY_CP"
if [ -n "$CLASSPATH" ]; then
append java_args -classpath "$CLASSPATH"
fi
append java_args -Djruby.home="$JRUBY_HOME"
fi

if [ -n "$classpath_value" ]; then
append java_args -classpath "$classpath_value"
fi

append java_args -Djruby.home="$JRUBY_HOME" \
Expand Down
Loading