jruby-launcher 2.0.0.pre2-java → 2.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 297592e7324c369c06ff548ab5531631965e16f4ee3c04da498e145be259298e
-  data.tar.gz: 7301d02d2c0d4aaa8984e4a03ab049cb68a7ffea4f1b66c6c6f0e6f813ae91e9
+  metadata.gz: ce700065b9536475d0189601d05547794bc1404a6a113c2970787ba4a33f4ac3
+  data.tar.gz: 3f1d5df96d0d30f3996158e5916e83b083f98b4b001268d16506c082813b73b3
 SHA512:
-  metadata.gz: b1dd776996f59ec4d9fb6cfc150b85d4e0689791ded13e218fe40b74b49300ecdd4caec0e0a6876ecf276a46c6d1ffd970eb98a46152b1707fb79b0b8d139734
-  data.tar.gz: 153c9f77f4042930b91fdd7703aeee9b2574deb8aa5f35e6f93feaf00f7a4e1b4762b31c34b5ba6e33b63afe57dfc6ad54c678e8c1a1d77724c0c17d13704196
+  metadata.gz: d0c614a29cf3b9f267fc3ce6ef2b0646e09485b9cd1cf17e873e6e2cb174e924cd86bef6b81cf87cc6c1d7f7d7eb903000ffb32ed985e2cfc1d27cb6b5b8a3bd
+  data.tar.gz: 39362111cace4f25ad54bfe32f27feb881b6fce946fd7d6706976f6c11049daaf114ab1b4239b430b32c10b0ab9c25223ef78fc1987c2b44e42c98ff2159cc88

data/Makefile

@@ -37,9 +37,12 @@ install:
 	@if [ x$(BINDIR) = xnotspecified/bin ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
 	@if [ ! -w $(BINDIR) ]; then echo "'$(BINDIR)' does not exist or cannot write to '$(BINDIR)'."; exit 1; fi
 	@if [ -f $(BINDIR)/jruby -a ! -w $(BINDIR)/jruby ]; then echo "Cannot write to '$(BINDIR)/jruby'."; exit 1; fi
-	cp ./jruby $(BINDIR)/jruby
+	cp -a ./jruby $(BINDIR)/jruby
 	@if [ x$(PREFIX) = xnotspecified ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
-	@if [ ! -f $(BINDIR)/jruby.sh ]; then cp ./exe/jruby.sh $(BINDIR)/jruby.sh; fi
+	# Restore jruby.sh if it has been deleted
+	@if [ ! -f $(BINDIR)/jruby.sh ]; then cp -a ./exe/jruby.sh $(BINDIR)/jruby.sh; fi
+	# Install a backup jruby.sh in case it is deleted later
+	cp -a ./exe/jruby.sh $(BINDIR)/jruby.sh.bak
 
 test:
 	$(RAKE)

data/exe/jruby.sh

@@ -505,11 +505,37 @@ fi
 
 # ----- Detect Java version and determine available features ------------------
 # shellcheck source=/dev/null
-java_version=$(. "$JAVA_HOME/release" && echo "${JAVA_VERSION-}")
+if [ -f "$JAVA_HOME/release" ]; then
+    java_version=$(. "$JAVA_HOME/release" && echo "${JAVA_VERSION-}")
+
+    # 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
+
+# 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
+else
+    # Only 9.4.12.0 and earlier will have shipped without a .java-version file, so fall back on minimum of 8
+    minimum_java_version=8
+fi
 add_log "Detected Java version: $java_version"
 
-# Split version out for integer comparisons
-java_major=${java_version%%.*}
+# Present a useful error if running a Java version lower than bin/.java-version
+if [ "$java_major" -lt "$minimum_java_version" ]; then
+    echo "This version of JRuby requires Java ${minimum_java_version}+."
+    echo "Make sure JAVA_HOME points at JDK ${minimum_java_version} or higher"
+    echo "Detected Java version: $java_version"
+    echo "Detected JAVA_HOME: $JAVA_HOME"
+    exit 1
+fi
 
 # AppCDS support
 if [ "$java_major" -ge 13 ] && exists "$JAVA_HOME"/lib/server/*.jsa; then

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "2.0.0.pre2"
+  VERSION = "2.0.1"
 end

data/unixlauncher.c

@@ -13,8 +13,10 @@
  * contained within it.
  */
 
-static const char script_name[] = "jruby.sh";
+#define LENGTH(a) (sizeof(a) / sizeof(0[a]))
 
+static const char *script_names[] = { "jruby.sh", "jruby.sh.bak" };
+static const char *no_scripts_error = "jruby.sh or jruby.sh.bak";
 
 static char *which(const char *const executable) {
     const size_t exe_length = strlen(executable);
@@ -100,7 +102,7 @@ int unixlauncher_run(int argc, char *argv[], char *envp[]) {
         self_path = which(argv[0]);
 
         if (self_path == NULL) {
-            fprintf(stderr, "Error: Could not find %s executable\n", script_name);
+            fprintf(stderr, "Error: Could not find %s executable\n", argv[0]);
             return 1;
         }
 
@@ -118,25 +120,30 @@ int unixlauncher_run(int argc, char *argv[], char *envp[]) {
     }
     size_t script_dir_length = strlen(script_dir);
 
-    // Allocate space for complete script path
-    size_t script_path_length = strlen(script_name) + script_dir_length + 1;
-    // Leave space for null terminator
-    char *script_path = malloc(script_path_length + 1);
+    // Try main script and backup script before giving up
+    for (int i = 0; i < LENGTH(script_names); i++) {
+        const char *script_name = script_names[i];
 
-    // Concatenate script dir and script name
-    memcpy(script_path, script_dir, script_dir_length);
-    script_path[script_dir_length] = '/';
-    memcpy(script_path + script_dir_length + 1, script_name, strlen(script_name));
-    script_path[script_path_length] = '\0';
+        // Allocate space for complete script path
+        size_t script_path_length = strlen(script_name) + script_dir_length + 1;
+        // Leave space for null terminator
+        char *script_path = malloc(script_path_length + 1);
 
-    // Reuse argv for script command line
-    argv[0] = script_path;
-    int ret = execv(argv[0], argv);
+        // Concatenate script dir and script name
+        memcpy(script_path, script_dir, script_dir_length);
+        script_path[script_dir_length] = '/';
+        memcpy(script_path + script_dir_length + 1, script_name, strlen(script_name));
+        script_path[script_path_length] = '\0';
 
-    if (ret < 0) {
-        fprintf(stderr, "%s: %s: %s\n", original_self, strerror(errno), script_path);
+        // Reuse argv for script command line
+        argv[0] = script_path;
+        execv(argv[0], argv);
+
+        free(script_path);
     }
 
-    free(script_path);
+    // If we get here neither script was available, so we error
+    fprintf(stderr, "%s: No executable %s found in %s\n", original_self, no_scripts_error, script_dir);
+
     return EXIT_FAILURE;
 }

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "2.0.0.pre2"
+#define JRUBY_LAUNCHER_VERSION "2.0.1"
 
 #endif // ! _VERSION_H_

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby-launcher
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.1
 platform: java
 authors:
 - Nick Sieger
 - Vladimir Sizikov
 bindir: bin
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2025-04-12 00:00:00.000000000 Z
 dependencies: []
 description: Builds and installs a native launcher for JRuby on your system
 email: