summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtool/rbinstall.rb12
1 files changed, 3 insertions, 9 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 3a36777420..62a44af6f9 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -553,12 +553,10 @@ module RbInstall
end
class Ext < self
- def skip_install?(files)
+ def ruby_libraries
# install ext only when it's configured
- !File.exist?("#{makefile_dir}/Makefile")
- end
+ return [] unless File.exist?("#{makefile_dir}/Makefile")
- def ruby_libraries
Dir.glob("lib/**/*.rb", base: makefile_dir)
end
@@ -570,10 +568,6 @@ module RbInstall
end
class Lib < self
- def skip_install?(files)
- files.empty?
- end
-
def ruby_libraries
gemname = File.basename(gemspec, ".gemspec")
base = relative_base || gemname
@@ -763,7 +757,7 @@ def install_default_gem(dir, srcdir, bindir)
spec = load_gemspec("#{base}/#{src}")
file_collector = RbInstall::Specs::FileCollector.for(srcdir, dir, src)
files = file_collector.collect
- if file_collector.skip_install?(files)
+ if files.empty?
next
end
spec.files = files