Skip to content

Launcher: Defensive fixes #8730

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 6 commits into from
Sep 2, 2025
Merged

Launcher: Defensive fixes #8730

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cdffa90
launcher: Handle missing argument
mrnoname1000 Apr 8, 2025
8fd19bf
launcher: Try to find $HOME if it's missing
mrnoname1000 Mar 31, 2025
d72a127
launcher: Parse $JAVA_HOME/release file to avoid syntax errors
mrnoname1000 Apr 8, 2025
09bfb23
launcher: Use Java runtime version for AppCDS filename
mrnoname1000 Apr 8, 2025
89dbb3b
launcher: Handle missing variables from $JAVA_HOME/release
mrnoname1000 Apr 8, 2025
c5fa94b
launcher: Unquote only used values from release file
mrnoname1000 Apr 16, 2025
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
54 changes: 48 additions & 6 deletions bin/jruby.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,16 @@ is_newer() {
[ -e "$master" ] && ! find "$@" -newer "$master" 2>/dev/null | read -r _
}

# unquote STRING
#
# Remove single/double quotes from beginning and end of a string
unquote() {
REPLY=$1
case $REPLY in
(\"*\" | \'*\') REPLY=${REPLY#?}; REPLY=${REPLY%?} ;;
esac
}

# echo [STRING...]
#
# Dumb echo, i.e. print arguments joined by spaces with no further processing
Expand Down Expand Up @@ -402,6 +412,15 @@ JRUBY_HOME="${SELF_PATH%/*/*}"

# ----- File paths for various options and files we'll process later ----------

# Find HOME of current user if empty
if [ -z "${HOME-}" ]; then
username=$(id -un)
case $username in
(*[!_[:alnum]]*) ;;
(*) eval HOME="~$username"; export HOME ;;
esac
fi

# Module options to open up packages we need to reflect
readonly jruby_module_opts_file="$JRUBY_HOME/bin/.jruby.module_opts"

Expand Down Expand Up @@ -504,21 +523,39 @@ if $use_modules; then
fi

# ----- Detect Java version and determine available features ------------------

# assume Java 8 if no release file
java_version=1.8
java_major=8

# shellcheck source=/dev/null
if [ -f "$JAVA_HOME/release" ]; then
java_version=$(. "$JAVA_HOME/release" && echo "${JAVA_VERSION-}")
# Get java version from JAVA_HOME/release file
while IFS= read -r line; do
case $line in
(\#*) continue ;;
esac

name=${line%%=*}
value=${line#*=}

case $name in
(JAVA_VERSION) unquote "$value" && java_version=$REPLY ;;
(JAVA_RELEASE_VERSION) unquote "$value" && java_runtime_version=$REPLY ;;
esac
done < "$JAVA_HOME"/release
unset line name value

# convert version to major, considering 1.8 as 8
case $java_version in
1.8 | 1.8.*) java_major=8 ;;
*) java_major=${java_version%%.*} ;;
esac
else
# assume Java 8 if no release file
java_version=1.8
java_major=8
fi

# Default java_runtime_version to $java_version
: "${java_runtime_version:=$java_version}"

# shellcheck source=/dev/null
if [ -f "$JRUBY_HOME/bin/.java-version" ] && . "$JRUBY_HOME/bin/.java-version" && [ "${JRUBY_MINIMUM_JAVA_VERSION-}" ]; then
minimum_java_version=$JRUBY_MINIMUM_JAVA_VERSION
Expand All @@ -527,6 +564,7 @@ else
minimum_java_version=8
fi
add_log "Detected Java version: $java_version"
add_log "Detected Java runtime version: $java_runtime_version"

# Present a useful error if running a Java version lower than bin/.java-version
if [ "$java_major" -lt "$minimum_java_version" ]; then
Expand Down Expand Up @@ -702,6 +740,10 @@ do
-X*.*) append java_args -Djruby."${1#-X}" ;;
# Match switches that take an argument
-[CeIS])
if [ "$#" -eq 1 ]; then
echo "Error: Missing argument to $1" >&2
exit 2
fi
append ruby_args "$1" "$2"
shift
;;
Expand Down Expand Up @@ -803,7 +845,7 @@ if $use_modules; then
fi

# Default JVM Class Data Sharing Archive (jsa) file for JVMs that support it
readonly jruby_jsa_file="$JRUBY_HOME/lib/jruby-java$java_version.jsa"
readonly jruby_jsa_file="$JRUBY_HOME/lib/jruby-java$java_runtime_version.jsa"

# Find JSAs for all Java versions
assign jruby_jsa_files "$JRUBY_HOME"/lib/jruby-java*.jsa
Expand Down