File tree Expand file tree Collapse file tree 1 file changed +7
-5
lines changed Expand file tree Collapse file tree 1 file changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -205,10 +205,10 @@ def ruby_launcher
205
205
end
206
206
207
207
raise "The Ruby executable #{ ruby_launcher } does not exist" unless File . exist? ( ruby_launcher )
208
- ruby_launcher = File . realpath ( ruby_launcher )
209
-
210
208
raise "The Ruby executable #{ ruby_launcher } is not executable" unless File . executable? ( ruby_launcher )
209
+
211
210
@ruby_launcher = ruby_launcher
211
+ @ruby_launcher_realpath = File . realpath ( ruby_launcher )
212
212
213
213
unless @silent
214
214
shortened_path = @ruby_launcher . sub ( %r[^#{ Regexp . escape TRUFFLERUBY_DIR } /] , '' ) . sub ( %r[/bin/(ruby|truffleruby)$] , '' )
@@ -222,13 +222,14 @@ def ruby_launcher
222
222
223
223
# use same ruby_launcher in subprocess jt instances
224
224
# cannot be set while building
225
- ENV [ 'RUBY_BIN' ] = ruby_launcher
225
+ ENV [ 'RUBY_BIN' ] = @ ruby_launcher
226
226
@ruby_launcher
227
227
end
228
228
alias_method :require_ruby_launcher! , :ruby_launcher
229
229
230
230
def ruby_home
231
- File . expand_path ( '../..' , ruby_launcher )
231
+ require_ruby_launcher!
232
+ File . expand_path ( '../..' , @ruby_launcher_realpath )
232
233
end
233
234
234
235
def graalvm_home
@@ -280,7 +281,8 @@ def truffleruby?
280
281
end
281
282
282
283
def truffleruby_launcher_path
283
- @truffleruby_launcher_path ||= File . join File . dirname ( ruby_launcher ) , 'truffleruby'
284
+ require_ruby_launcher!
285
+ @truffleruby_launcher_path ||= File . expand_path ( '../truffleruby' , @ruby_launcher_realpath )
284
286
end
285
287
286
288
def truffleruby!
You can’t perform that action at this time.
0 commit comments