Pregenerate bin/ruby and bin/ruby.bat

headius · headius · commit 524b5fe240bc · 2025-06-26T18:07:23.000-05:00
This modifies our bin/ruby script to be exactly the same as the bin/jruby.sh script, in order to avoid shipping symlinks in our dist archives. This also avoids traversing a symlink when running the `ruby` command instead of `jruby`. This also introduces bin/ruby.bat that relaunches from bin/jruby.exe. These fixes are intended to avoid requiring workarounds as described in jruby/jruby-launcher#29 here: jruby/jruby-launcher#29 (comment)
diff --git a/bin/ruby b/bin/ruby
diff --git a/bin/ruby.bat b/bin/ruby.bat
@@ -0,0 +1,3 @@
+REM Relaunch with jruby.exe
+@ECHO OFF
+@\"%~dp0jruby.exe\" %*
diff --git a/core/pom.rb b/core/pom.rb
@@ -295,7 +295,7 @@
                   ])
   end
 
-  copy_goal = [:exec, :executable => '/bin/sh', :arguments => ['-c', 'cp ${jruby.basedir}/bin/jruby.sh ${jruby.basedir}/bin/jruby']]
+  copy_goal = [:exec, :executable => '/bin/sh', :arguments => ['-c', 'cp ${jruby.basedir}/bin/jruby.sh ${jruby.basedir}/bin/jruby ; cp ${jruby.basedir}/bin/jruby.sh ${jruby.basedir}/bin/ruby']]
 
   profile :clean do
     activation do
@@ -350,6 +350,7 @@
 
     activation do
       file( :missing => '../bin/jruby' )
+      file( :missing => '../bin/ruby' )
     end
     activation do
       # hack to get the os triggeer into the model
diff --git a/core/pom.xml b/core/pom.xml
@@ -670,7 +670,7 @@ DO NOT MODIFY - GENERATED CODE
                   <executable>/bin/sh</executable>
                   <arguments>
                     <argument>-c</argument>
-                    <argument>cp ${jruby.basedir}/bin/jruby.sh ${jruby.basedir}/bin/jruby</argument>
+                    <argument>cp ${jruby.basedir}/bin/jruby.sh ${jruby.basedir}/bin/jruby ; cp ${jruby.basedir}/bin/jruby.sh ${jruby.basedir}/bin/ruby</argument>
                   </arguments>
                 </configuration>
               </execution>
@@ -760,7 +760,7 @@ DO NOT MODIFY - GENERATED CODE
                   <executable>/bin/sh</executable>
                   <arguments>
                     <argument>-c</argument>
-                    <argument>cp ${jruby.basedir}/bin/jruby.sh ${jruby.basedir}/bin/jruby</argument>
+                    <argument>cp ${jruby.basedir}/bin/jruby.sh ${jruby.basedir}/bin/jruby ; cp ${jruby.basedir}/bin/jruby.sh ${jruby.basedir}/bin/ruby</argument>
                   </arguments>
                 </configuration>
               </execution>
diff --git a/lib/pom.rb b/lib/pom.rb
@@ -423,6 +423,8 @@ def installer.ensure_required_ruby_version_met; end
     jruby_complete = ctx.project.properties.get_property( 'jruby.complete.home' )
     FileUtils.cp( File.join( jruby_complete, 'bin', 'jruby.sh' ),
                   File.join( jruby_complete, 'bin', 'jruby' ) )
+    FileUtils.cp( File.join( jruby_complete, 'bin', 'jruby.sh' ),
+                  File.join( jruby_complete, 'bin', 'ruby' ) )
   end
 
   execute 'jrubydir', 'prepare-package' do |ctx|

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+REM Relaunch with jruby.exe`
	`2`	`+@ECHO OFF`
	`3`	`+@\"%~dp0jruby.exe\" %*`