diff options
| author | David RodrÃguez <[email protected]> | 2021-04-08 10:40:53 +0200 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2021-05-11 11:29:41 +0900 |
| commit | cc4d8d037cd49ff338cc32969295c32ce188e384 (patch) | |
| tree | a598093bf89bbf165a0fd47bacb8d0bc4a58cf36 | |
| parent | 774cc32b4d4962ef685fb852a2dbf1897f64a8f7 (diff) | |
Simplify syncing bundler
These files no longer exist upstream, so they don't need to be synced.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4367
| -rw-r--r-- | tool/sync_default_gems.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 7f0ecba405..0a5761a176 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -95,7 +95,7 @@ def sync_default_gems(gem) cp_r(Dir.glob("#{upstream}/lib/rubygems*"), "lib") cp_r("#{upstream}/test/rubygems", "test") when "bundler" - rm_rf(%w[lib/bundler lib/bundler.rb libexec/bundler libexec/bundle spec/bundler tool/bundler/*] + Dir.glob("man/{bundle*,gemfile*}")) + rm_rf(%w[lib/bundler lib/bundler.rb libexec/bundler libexec/bundle spec/bundler tool/bundler/*]) cp_r(Dir.glob("#{upstream}/bundler/lib/bundler*"), "lib") cp_r(Dir.glob("#{upstream}/bundler/exe/bundle*"), "libexec") cp_r("#{upstream}/bundler/bundler.gemspec", "lib/bundler") @@ -103,7 +103,6 @@ def sync_default_gems(gem) cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/test_gems*"), "tool/bundler") cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/rubocop_gems*"), "tool/bundler") cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/standard_gems*"), "tool/bundler") - cp_r(Dir.glob("#{upstream}/bundler/man/*.{1,5,1\.txt,5\.txt,ronn}"), "man") `git checkout lib/bundler/bundler.gemspec` rm_rf(%w[spec/bundler/support/artifice/vcr_cassettes]) when "rdoc" |