Update jruby.sh from JRuby master

Author: headius

exe/jruby.sh

@@ -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
@@ -179,7 +189,6 @@ echo() {
 
 # ----- Set variable defaults -------------------------------------------------
 
-java_class=org.jruby.Main
 JRUBY_SHELL=/bin/sh
 
 # Detect cygwin and mingw environments
@@ -238,7 +247,7 @@ fi
 # Gather environment information as we go
 readonly cr='
 '
-environment_log="JRuby Environment$cr================="
+environment_log=""
 add_log() {
     environment_log="${environment_log}${cr}${*-}"
 }
@@ -402,6 +411,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"
 
@@ -417,6 +435,9 @@ readonly pwd_jruby_java_opts_file="$PWD/.jruby.java_opts"
 # Options from .dev_mode.java_opts for "--dev" mode, to reduce JRuby startup time
 readonly dev_mode_opts_file="$JRUBY_HOME/bin/.dev_mode.java_opts"
 
+# Release file with version-specific values
+readonly jruby_release_file="$JRUBY_HOME/bin/.jruby.release"
+
 # ----- Initialize environment log --------------------------------------------
 
 add_log
@@ -504,21 +525,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
@@ -527,6 +566,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
@@ -605,6 +645,18 @@ JAVA_OPTS="$JAVA_OPTS_TEMP"
 
 CP_DELIMITER=":"
 
+# Get main class and version from .jruby.release
+
+# shellcheck source=/dev/null
+# shellcheck disable=2153  # Assigned in sourced file
+if [ -f "$jruby_release_file" ] && . "$jruby_release_file"; then
+    java_class=$JRUBY_MAIN
+    jruby_version=$JRUBY_VERSION
+else
+    java_class=org.jruby.main
+    jruby_version=unspecified
+fi
+
 # Find main jruby jar and add it to the classpath
 jruby_jar=
 for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
@@ -702,6 +754,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
             ;;
@@ -803,7 +859,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
@@ -955,7 +1011,9 @@ add_log
 add_log "Java command line:"
 add_log "  $*"
 
+# shellcheck source=/dev/null
 if $print_environment_log; then
+    environment_log="JRuby Environment${cr}=================${cr}${cr}JRuby version: ${jruby_version}${environment_log}"
     echo "$environment_log"
     exit 0
 fi