File tree Expand file tree Collapse file tree 2 files changed +2
-5
lines changed Expand file tree Collapse file tree 2 files changed +2
-5
lines changed Original file line number Diff line number Diff line change @@ -860,7 +860,7 @@ build_package_jruby() {
860
860
cd " ${PREFIX_PATH} /bin"
861
861
ln -fs jruby ruby
862
862
chmod +x ruby
863
- install_jruby_launcher
863
+ install_jruby_launcher " $1 "
864
864
remove_windows_files
865
865
fix_jruby_shebangs
866
866
}
@@ -869,9 +869,7 @@ install_jruby_launcher() {
869
869
# shellcheck disable=SC2164
870
870
cd " ${PREFIX_PATH} /bin"
871
871
# workaround for https://github.com/jruby/jruby/issues/7799
872
- local jruby_version
873
- jruby_version=" $( ./ruby -e ' puts JRUBY_VERSION' 2> /dev/null) "
874
- [[ $jruby_version != " 9.2." * ]] ||
872
+ [[ $1 != " jruby-9.2." * ]] ||
875
873
capture_command ./ruby gem update -q --silent --system 3.3.26 --no-document --no-post-install-message
876
874
capture_command ./ruby gem install jruby-launcher --no-document
877
875
}
Original file line number Diff line number Diff line change 848
848
assert_success
849
849
850
850
assert_build_log << OUT
851
- jruby [-e,puts JRUBY_VERSION]
852
851
jruby [gem,install,jruby-launcher,--no-document]
853
852
OUT
854
853
You can’t perform that action at this time.
0 commit comments