Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bf87a0bdf82d
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fd818497d4eb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 21, 2016

  1. Copy the full SHA
    7ba2562 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    fd81849 View commit details
Showing with 0 additions and 18 deletions.
  1. +0 −18 tool/jt.rb
18 changes: 0 additions & 18 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -158,24 +158,6 @@ def self.find_jruby
end
end

def self.find_jruby_bin_dir
# Make sure bin/ruby points to the right launcher
ruby_symlink = "#{JRUBY_DIR}/bin/ruby"
jruby_bin = Utilities.find_jruby
if File.symlink?(ruby_symlink) && File.expand_path(File.readlink(ruby_symlink), File.dirname(ruby_symlink)) != jruby_bin
FileUtils.rm_f ruby_symlink
File.symlink jruby_bin, ruby_symlink
end

if ENV['RUBY_BIN']
File.dirname(ENV['RUBY_BIN'])
elsif jruby_eclipse? or mx?
JRUBY_DIR + "/bin"
else
File.dirname(find_jruby)
end
end

def self.find_repo(name)
[JRUBY_DIR, "#{JRUBY_DIR}/.."].each do |dir|
found = Dir.glob("#{dir}/#{name}*").first