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

rbuninstall.rb: show paths without destdir as well as rbinstall.rb

Browse source
This commit is contained in:
Nobuyoshi Nakada 2020-05-09 13:45:50 +09:00
parent e88bb6a2f7
commit 1181edd54c
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tool/rbuninstall.rb
View file

@ -23,7 +23,6 @@ BEGIN {
$files = [] $files = []
} }
list = ($_.chomp!('/') ? $dirs : $files) list = ($_.chomp!('/') ? $dirs : $files)
$_ = File.join($destdir, $_) if $destdir
list << $_ list << $_
END { END {
status = true status = true
@ -32,6 +31,7 @@ END {
$files.each do |file| $files.each do |file|
print "rm #{file}#{ors}" print "rm #{file}#{ors}"
unless $dryrun unless $dryrun
file = File.join($destdir, file) if $destdir
begin begin
File.unlink(file) File.unlink(file)
rescue Errno::ENOENT rescue Errno::ENOENT
@ -49,13 +49,14 @@ END {
dir = File.dirname(dir) while File.basename(dir) == '.' dir = File.dirname(dir) while File.basename(dir) == '.'
print "rmdir #{dir}#{ors}" print "rmdir #{dir}#{ors}"
unless $dryrun unless $dryrun
realdir = $destdir ? File.join($destdir, dir) : dir
begin begin
begin begin
unlink.delete(dir) unlink.delete(dir)
Dir.rmdir(dir) Dir.rmdir(realdir)
rescue Errno::ENOTDIR rescue Errno::ENOTDIR
raise unless File.symlink?(dir) raise unless File.symlink?(realdir)
File.unlink(dir) File.unlink(realdir)
end end
rescue Errno::ENOENT, Errno::ENOTEMPTY rescue Errno::ENOENT, Errno::ENOTEMPTY
rescue rescue