kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

rbinstall.rb: just call File.basename directly

Browse source
This commit is contained in:
Nobuyoshi Nakada 2021-07-08 17:58:25 +09:00
parent b90ca734f3
commit d6cf4c0c99
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tool/rbinstall.rb
View file

@ -22,7 +22,6 @@ require 'fileutils'
require 'shellwords' require 'shellwords'
require 'optparse' require 'optparse'
require 'optparse/shellwords' require 'optparse/shellwords'
require 'pathname'
require 'rubygems' require 'rubygems'
begin begin
require "zlib" require "zlib"
@ -730,7 +729,7 @@ module RbInstall
base = @base_dir base = @base_dir
prefix = base.sub(/lib\/.*?\z/, "") prefix = base.sub(/lib\/.*?\z/, "")
# for lib/net/net-smtp.gemspec # for lib/net/net-smtp.gemspec
if m = Pathname.new(@gemspec).basename(".gemspec").to_s.match(/.*\-(.*)\z/) if m = File.basename(@gemspec, ".gemspec").match(/.*\-(.*)\z/)
base = "#{@base_dir}/#{m[1]}" unless remove_prefix(prefix, @base_dir).include?(m[1]) base = "#{@base_dir}/#{m[1]}" unless remove_prefix(prefix, @base_dir).include?(m[1])
end end
end end
@ -743,7 +742,7 @@ module RbInstall
[File.basename(@gemspec, '.gemspec') + '.rb'] [File.basename(@gemspec, '.gemspec') + '.rb']
end end
case Pathname.new(@gemspec).basename(".gemspec").to_s case File.basename(@gemspec, ".gemspec")
when "net-http" when "net-http"
files << "lib/net/https.rb" files << "lib/net/https.rb"
when "optparse" when "optparse"