jruby-launcher 2.0.0.pre3-java → 2.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66622259dbdee0e98846fb968d3a563a76b6e5e2c2f7b5a582c1d7deea490f30
-  data.tar.gz: 54d1ea1244e8a127b27b6b691da3bbe55e64709c9e04da10f8d68ebbe3a23c7f
+  metadata.gz: 6de73d28236b6f759f5aa5e49ad77b09e6d505bb645b789b3e24bae79aff1ae2
+  data.tar.gz: ccfee027b5c96afeb88e4b4c4e880d361ebbd382c7061209c3247a9bf6363998
 SHA512:
-  metadata.gz: 88721cb3c1123f98074a748b7411d0be1cca648ec706d7dc77bea488af1eadb5405a76f8c42162aa195ccbe74ef5c6e927d2aab8cafcdd9f7906e949791ebc74
-  data.tar.gz: ce7d34b70c77bbb60e631a0f4c7306c0d391c09bd9583b0361c10ff6dbeefa407141f4a74d622ceb12064f00c3ff10c04e47d73740b6da528399073e4c12e8e7
+  metadata.gz: e89921ec1bf976c2572ede7ca7c0f328759ca007a4e85dcc37b0af998e59e58f4ed895ce617b16e5cff1cdec909f8aed452cc5267f26d7021dd9ad9efaeb9a0b
+  data.tar.gz: d4189f74a4b08adc66e2ad23b6997604331ec02ac81ceed26fc05189c63e1cbdc838c4eed3759fdcdbfe317147379274d27286d2bd231fc6fe50ede23cc3f36b

data/Makefile

@@ -37,9 +37,14 @@ 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 [ -f $(BINDIR)/ruby -a ! -w $(BINDIR)/ruby ]; then echo "Cannot write to '$(BINDIR)/ruby'."; exit 1; fi
+	cp -a ./jruby $(BINDIR)/ruby
 	@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)
@@ -97,7 +102,7 @@ include $(SUB_IMPLMK)
 # Pick conf based on OS. for mingw64, must manually override for now.
 ifeq ($(OS),Windows_NT)
 CC=gcc
-CONF=mingw
+CONF=mingw64
 else
 CONF=unix
 endif

data/exe/jruby.sh

@@ -507,23 +507,35 @@ fi
 # shellcheck source=/dev/null
 if [ -f "$JAVA_HOME/release" ]; then
     java_version=$(. "$JAVA_HOME/release" && echo "${JAVA_VERSION-}")
-    if echo "${java_version}" | grep -q "1.8.\\.*"; then
-        java_version=8
-    fi
+
+    # 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
-    java_version=8
+    # 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" ]; then
-    minimum_java_version=$(. "$JRUBY_HOME/bin/.java-version" && echo "${JRUBY_MINIMUM_JAVA_VERSION-}")
+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
@@ -536,14 +548,6 @@ readonly java_has_appcds
 # Default to using AppCDS if available
 use_jsa_file="$java_has_appcds"
 
-# 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 "Current JAVA_HOME: $JAVA_HOME"
-    exit 1
-fi
-
 # AppCDS autogeneration
 if [ "$java_major" -ge 19 ]; then
     java_has_appcds_autogenerate=true

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "2.0.0.pre3"
+  VERSION = "2.0.2"
 end

data/pkg/jruby-launcher-2.0.1-java/extconf.rb

@@ -0,0 +1,12 @@
+mf = File.read('Makefile')
+mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{RbConfig::CONFIG['bindir']}")
+mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(RbConfig::CONFIG['libdir'])}")
+mf = mf.gsub(/^JRUBY_VERSION\s*=.*$/, "JRUBY_VERSION = #{JRUBY_VERSION}")
+
+# Launcher will use .module_opts file if present, otherwise hardcoded add-opens for this module.
+# Module options are only supported on JRuby 9.2.1 or higher.
+if JRUBY_VERSION =~ /(^1)|(^9\.[01])|(^9\.2\.0\.0)/
+  mf = mf.gsub(/^JRUBY_MODULE\s*=.*1$/, "JRUBY_MODULE =")
+end
+puts mf
+File.open('Makefile', 'wb') {|f| f << mf}

data/pkg/jruby-launcher-2.0.1-java/lib/jruby-launcher.rb

@@ -0,0 +1,3 @@
+module JRubyLauncher
+  VERSION = "2.0.2"
+end

data/pkg/jruby-launcher-2.0.1-java/spec/launcher_spec.rb

@@ -0,0 +1,288 @@
+require 'tmpdir'
+require File.expand_path('../spec_helper.rb', __FILE__)
+load File.expand_path('../../lib/jruby-launcher.rb', __FILE__)
+
+describe "JRuby native launcher", if: /Windows/.match?(ENV_JAVA['os.name']) do
+  it "should run org.jruby.Main" do
+    jruby_launcher_args("").last.should == "org/jruby/Main"
+  end
+
+  it "should pass unrecognized arguments to JRuby" do
+    jruby_launcher_args("-J-Dsome.option -v --help")[-3..-1].should == ["org/jruby/Main", "-v", "--help"]
+  end
+
+  it "should print help message" do
+    args = jruby_launcher_args("-Xhelp 2>&1")
+    args.select {|l| l =~ /JRuby Launcher usage/}.should_not be_empty
+    args.should include("-X")
+    args = jruby_launcher_args("-X 2>&1")
+    args.detect {|l| l =~ /JRuby Launcher usage/}.should_not be_empty
+    args.should include("-X")
+  end
+
+  it "should use $JAVACMD when JAVACMD is specified" do
+    javacmd_path = File.join("path", "to", "jato")
+    with_environment "JAVACMD" => javacmd_path do
+      if windows?
+        jruby_launcher_args("-v 2>&1").join.should =~ /#{javacmd_path}/
+      else
+        jruby_launcher_args("-v").first.should == javacmd_path
+      end
+    end
+  end
+
+  it "should use $JAVA_HOME/bin/java when JAVA_HOME is specified" do
+    with_environment "JAVA_HOME" => File.join("some", "java", "home") do
+      if windows?
+        jruby_launcher_args("-v 2>&1").join.should =~ %r{some/java/home}
+      else
+        jruby_launcher_args("-v").first.should == File.join("some", "java", "home", "bin", "java")
+      end
+    end
+  end
+
+  it "should use -Xjdkhome argument above JAVA_HOME" do
+    with_environment "JAVA_HOME" => File.join("env", "java", "home") do
+      if windows?
+        jruby_launcher_args("-Xjdkhome some/java/home 2>&1").join.should =~ %r{some/java/home}
+      else
+        jruby_launcher_args("-Xjdkhome some/java/home").first.should == File.join("some", "java", "home", "bin", "java")
+      end
+    end
+  end
+
+  it "should drop the backslashes at the end of JAVA_HOME" do
+    with_environment "JAVA_HOME" => File.join("some", "java", "home\\\\") do
+      if windows?
+        jruby_launcher_args("").join.should =~ %r{some/java/home}
+      else
+        jruby_launcher_args("").first.should == File.join("some", "java", "home", "bin", "java")
+      end
+    end
+  end
+
+  it "should complain about a missing log argument" do
+    jruby_launcher("-Xtrace 2>&1").should =~ /Argument is missing for "-Xtrace"/
+    jruby_launcher("-Xtrace -- 2>&1").should =~ /Argument is missing for "-Xtrace"/
+  end
+
+  it "should complain about a missing jdkhome argument" do
+    jruby_launcher("-Xjdkhome 2>&1").should =~ /Argument is missing/
+    jruby_launcher("-Xjdkhome -- 2>&1").should =~ /Argument is missing/
+  end
+
+  it "should complain about a missing classpath append argument" do
+    jruby_launcher("-Xcp:a 2>&1").should =~ /Argument is missing/
+    jruby_launcher("-Xcp:a -- 2>&1").should =~ /Argument is missing/
+  end
+
+  it "should run nailgun server with --ng-server option" do
+    jruby_launcher_args("--ng-server").last.should == "com/martiansoftware/nailgun/NGServer"
+  end
+
+  it "should run nailgun client with --ng option" do
+    jruby_launcher_args('--ng -e "puts 1"').should == ["org.jruby.util.NailMain", "-e", "puts 1"]
+  end
+
+  it "should handle -J JVM options" do
+    jruby_launcher_args("-J-Darg1=value1 -J-Darg2=value2").should include("-Darg1=value1", "-Darg2=value2")
+  end
+
+  it "should pass -Xprop.erty=value as -J-Djruby.prop.erty=value" do
+    jruby_launcher_args("-Xprop.erty=value").should include("-Djruby.prop.erty=value")
+  end
+
+  it "should pass -Xproperties as --properties" do
+    jruby_launcher_args("-Xproperties").should include("--properties")
+  end
+
+  it "should allow max heap to be overridden" do
+    jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m")
+  end
+
+  it "should default to 2048k max stack" do
+    jruby_launcher_args("").should include("-Xss2048k")
+  end
+
+  it "should allow max stack to be overridden" do
+    jruby_launcher_args("-J-Xss512k").should include("-Xss512k")
+  end
+
+  it "should add the contents of the CLASSPATH environment variable" do
+    with_environment "CLASSPATH" => "some.jar" do
+      classpath_arg(jruby_launcher_args("")).should =~ /some.jar/
+    end
+  end
+
+  it "should add the classpath elements in proper order" do
+    s = File::PATH_SEPARATOR
+    with_environment "CLASSPATH" => "some-env.jar" do
+      args = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar")
+      classpath_arg(args).should =~ /some.jar.*#{s}some-env.jar#{s}some-other.jar/
+    end
+  end
+
+  it "should use the --server compiler" do
+    jruby_launcher_args("--server").should include("-server")
+  end
+
+  it "should use the --client compiler" do
+    jruby_launcher_args("--client").should include("-client")
+  end
+
+  it "should set the JMX settings when --manage is present" do
+    jruby_launcher_args("--manage").should include("-Dcom.sun.management.jmxremote", "-Djruby.management.enabled=true")
+  end
+
+  it "should set the headless flag when --headless is present" do
+    jruby_launcher_args("--headless").should include("-Djava.awt.headless=true")
+  end
+
+  it "should pass -Xprof when --sample is present" do
+    jruby_launcher_args("--sample").should include("-Xprof")
+  end
+
+  it "should stop argument processing when a -- is seen" do
+    jruby_launcher_args("-- -Xhelp -Xtrace --headless").should include("-Xhelp", "-Xtrace", "--headless")
+  end
+
+  # JRUBY-4151
+  it "should properly handle single quotes" do
+    jruby_launcher_args("-e 'ABC DEF'").should include("ABC DEF")
+  end
+
+  # JRUBY-4581
+  it "should prepend JRUBY_OPTS to the start of the argument list to process" do
+    with_environment "JRUBY_OPTS" => "--server -J-Dsome.key=val -rubygems" do
+      jruby_launcher_args("-e 'ABC DEF'").should include("-server", "-Dsome.key=val", "-rubygems", "-e", "ABC DEF")
+    end
+  end
+
+  # JRUBY-4611
+  it "stops argument processing on first non-option argument" do
+    jruby_launcher_args("foo.rb --sample")[-2..-1].should == ["foo.rb", "--sample"]
+  end
+
+  # JRUBY-4608
+  if RbConfig::CONFIG['target_os'] =~ /darwin/i
+    it "includes file.encoding=UTF-8 on Mac if JAVA_ENCODING is not set" do
+      jruby_launcher_args("-e true").should include("-Dfile.encoding=UTF-8")
+      with_environment "JAVA_ENCODING" => "MacRoman" do
+        jruby_launcher_args("-e true").should_not include("-Dfile.encoding=UTF-8")
+      end
+    end
+  end
+
+  it "does not crash on empty args" do
+    jruby_launcher_args("-e ''").should include("-e")
+    jruby_launcher("-Xtrace '' 2>&1").should =~ /-Xtrace/
+    jruby_launcher("-Xjdkhome '' 2>&1").should =~ /-Xjdkhome/
+  end
+
+  # JRUBY-4706
+  it "should put JRuby on regular classpath when -Xnobootclasspath is used" do
+    # Java 9+ do not like bootclasspath so we do not use it
+    skip if ENV_JAVA['java.specification.version'].to_i >= 9
+
+    args = jruby_launcher_args("-e true")
+    args.grep(/Xbootclasspath/).should_not be_empty
+    args = jruby_launcher_args("-Xnobootclasspath -e true")
+    args.grep(/Xbootclasspath/).should be_empty
+  end
+
+  it "should put JRuby on regular classpath when VERIFY_JRUBY is set" do
+    with_environment "VERIFY_JRUBY" => "true" do
+      args = jruby_launcher_args("-e true")
+      args.grep(/Xbootclasspath/).should be_empty
+    end
+  end
+
+  # JRUBY-4709
+  it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
+    classpath_arg(jruby_launcher_args("-Xnobootclasspath -e true")).should =~
+      if windows?
+        /;$/
+      else
+        /:$/
+      end
+  end
+
+  # JRUBY-6016
+  it "should honor JAVA_MEM" do
+    with_environment "JAVA_MEM" => "-Xmx768m" do
+      jruby_launcher_args("").should include("-Xmx768m")
+    end
+  end
+
+  it "should honor JAVA_STACK" do
+    with_environment "JAVA_STACK" => "-Xss3072k" do
+      jruby_launcher_args("").should include("-Xss3072k")
+    end
+  end
+
+  it "should honor JRUBY_HOME" do
+    with_environment "JRUBY_HOME" => "/tmp" do
+      jruby_launcher_args("").should include("-Djruby.home=/tmp")
+    end
+  end
+
+  context "JRUBY_HOME set and JRUBY_HOME/lib/jruby.jar exists" do
+    let(:jruby_home) do
+      require 'tempfile'
+      t = Tempfile.new("jruby_home")
+      t.path.tap { t.close! }
+    end
+
+    before do
+      FileUtils.mkdir_p(File.join(jruby_home, "lib"))
+      FileUtils.touch(File.join(jruby_home, "lib", "jruby.jar"))
+    end
+    after { FileUtils.rm_rf jruby_home }
+
+    it "should add jruby.jar to the bootclasspath" do
+      # Java 9+ do not like bootclasspath so we do not use it
+      skip if ENV_JAVA['java.specification.version'].to_i >= 9
+
+      with_environment "JRUBY_HOME" => jruby_home do
+        jruby_launcher_args("").should include("-Xbootclasspath/a:#{jruby_home}/lib/jruby.jar")
+      end
+    end
+  end
+
+  it "should place user-supplied options after default options" do
+    args = jruby_launcher_args("-J-Djruby.home=/tmp")
+    home_args = args.select {|x| x =~ /^-Djruby\.home/ }
+    home_args.length.should == 2
+    home_args.last.should == "-Djruby.home=/tmp"
+  end
+
+  it "should print the version" do
+    jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version #{JRubyLauncher::VERSION}/
+  end
+
+  it "should not crash on format-strings" do
+    jruby_launcher_args("-e %s%s%s%s%s 2>&1").should include('-e', '%s%s%s%s%s')
+  end
+
+  it "should use --module-path on java9+ jruby 9.2.1+" do
+    # versions prior to 9.2.1 do not set a predictable module name
+    skip unless (JRUBY_VERSION.split('.') <=> ['9', '2', '1']) >= 0
+    
+    Dir.mktmpdir do |java_home|
+      FileUtils.mkdir_p(File.join(java_home, 'lib/modules'))
+      with_environment 'JAVA_HOME' => java_home do
+        jruby_launcher_args('').grep(/^--module-path=.*jruby.jar/).should_not be_empty
+      end
+    end
+  end
+
+  it "should not treat CLASSPATH entries as modules on java9+" do
+    Dir.mktmpdir do |java_home|
+      Dir.mkdir(File.join(java_home, 'jmods'))
+      with_environment 'JAVA_HOME' => java_home, 'CLASSPATH' => '/some/lib.jar' do
+        jruby_launcher_args('').grep(/^--module-path=.*\/some\/lib.jar/).should be_empty
+        classpath_arg(jruby_launcher_args('')).should =~ /\/some\/lib.jar/
+      end
+    end
+  end
+end

data/pkg/jruby-launcher-2.0.1-java/spec/spec_helper.rb

@@ -0,0 +1,76 @@
+require 'rspec'
+require 'rbconfig'
+require 'fileutils'
+
+module JRubyLauncherHelper
+  JRUBY_EXE = ''
+  WINDOWS = RbConfig::CONFIG['target_os'] =~ /mswin/
+
+  def self.check_executable_built
+    exe = File.expand_path("../../jruby", __FILE__) + RbConfig::CONFIG['EXEEXT']
+    unless File.executable?(exe)
+      raise "Error: launcher executable not built; type `make' before continuing."
+    end
+    top = File.dirname(exe)
+    name = File.basename(exe)
+    home = File.join(top, "build/home")
+    FileUtils.mkdir_p(File.join(home, "bin"))
+    FileUtils.cp(exe, File.join(home, "bin"))
+    if JRubyLauncherHelper::WINDOWS
+      FileUtils.cp(exe.sub(/exe/, 'dll'), File.join(home, "bin"))
+    end
+    FileUtils.mkdir_p(File.join(home, "lib"))
+    FileUtils.touch(File.join(home, "lib/jruby.jar"))
+    JRUBY_EXE.concat File.join(home, "bin", name)
+  end
+
+  def jruby_launcher(args)
+    `#{JRUBY_EXE} #{args}`
+  end
+
+  def jruby_launcher_args(args)
+    jruby_launcher("-Xcommand #{args}").split("\n")
+  end
+
+  def last_exit_code
+    $?.exitstatus
+  end
+
+  def windows?
+    WINDOWS
+  end
+
+  def classpath_arg(args)
+    index = args.index("-cp")
+    index.should > 0
+    args[index + 1]
+  end
+
+  def with_environment(pairs = {})
+    prev_env = {}
+    pairs.each_pair do |k,v|
+      prev_env[k] = ENV[k] if ENV.has_key?(k)
+      ENV[k] = v
+    end
+    begin
+      yield
+    ensure
+      pairs.keys.each {|k| ENV.delete(k)}
+      ENV.update(prev_env)
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before(:all) do
+    JRubyLauncherHelper.check_executable_built
+    # clear environment for better control
+    ENV.delete("JAVA_HOME")
+    ENV.delete("JRUBY_HOME")
+    ENV.delete("JAVA_OPTS")
+    ENV.delete("JRUBY_OPTS")
+    ENV.delete("CLASSPATH")
+    ENV.delete("JAVA_ENCODING")
+  end
+  config.include(JRubyLauncherHelper)
+end

data/spec/launcher_spec.rb

@@ -1,8 +1,9 @@
 require 'tmpdir'
+require 'rbconfig'
 require File.expand_path('../spec_helper.rb', __FILE__)
 load File.expand_path('../../lib/jruby-launcher.rb', __FILE__)
 
-describe "JRuby native launcher", if: /Windows/.match?(ENV_JAVA['os.name']) do
+describe "JRuby native launcher", if: /mswin/.match?(RbConfig::CONFIG['host_os']) do
   it "should run org.jruby.Main" do
     jruby_launcher_args("").last.should == "org/jruby/Main"
   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);
@@ -31,8 +33,7 @@ static char *which(const char *const executable) {
     dirs[dirs_length] = ':';
 
     size_t dir_head = 0;
-    size_t i = 0;
-    do {
+    for (size_t i = 0; i <= dirs_length; i++) {
         if (dirs[i] == ':') {
             // Declare convenient path variables
             char *const dir = dirs + dir_head;
@@ -59,7 +60,7 @@ static char *which(const char *const executable) {
 
             dir_head = i + 1;
         }
-    } while (dirs[i++]);
+    };
 
     // Lookup has failed, free if necessary and return NULL
     if (exe_path != NULL) {
@@ -100,7 +101,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 +119,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.pre3"
+#define JRUBY_LAUNCHER_VERSION "2.0.2"
 
 #endif // ! _VERSION_H_

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby-launcher
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
+  version: 2.0.2
 platform: java
 authors:
 - Nick Sieger
 - Vladimir Sizikov
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-04-08 00:00:00.000000000 Z
+date: 2025-07-09 00:00:00.000000000 Z
 dependencies: []
 description: Builds and installs a native launcher for JRuby on your system
 email:
@@ -39,6 +38,10 @@ files:
 - lib/jruby-launcher.rb
 - nbexecloader.h
 - ng.c
+- pkg/jruby-launcher-2.0.1-java/extconf.rb
+- pkg/jruby-launcher-2.0.1-java/lib/jruby-launcher.rb
+- pkg/jruby-launcher-2.0.1-java/spec/launcher_spec.rb
+- pkg/jruby-launcher-2.0.1-java/spec/spec_helper.rb
 - platformlauncher.cpp
 - platformlauncher.h
 - rb_w32_cmdvector.h
@@ -56,7 +59,6 @@ files:
 homepage: http://jruby.org
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -67,12 +69,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Native launcher for JRuby
 test_files: []