summaryrefslogtreecommitdiff
path: root/lib/fileutils.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/fileutils.rb')
-rw-r--r--lib/fileutils.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 0459a45..decd792 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -501,7 +501,11 @@ module FileUtils
File.rename s, d
rescue Errno::EXDEV
copy_entry s, d, true
- File.unlink s
+ if options[:secure]
+ remove_entry_secure s, options[:force]
+ else
+ remove_entry s, options[:force]
+ end
end
rescue SystemCallError
raise unless options[:force]
@@ -514,7 +518,7 @@ module FileUtils
module_function :move
OPT_TABLE['mv'] =
- OPT_TABLE['move'] = %w( noop verbose force )
+ OPT_TABLE['move'] = [:force, :noop, :verbose, :secure]
def rename_cannot_overwrite_file? #:nodoc:
/djgpp|cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM