You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
70 lines
2.8 KiB
70 lines
2.8 KiB
From 6ec28631f5d0a1d5f3a9f9c4879950089fce5ed2 Mon Sep 17 00:00:00 2001
|
|
From: Todd Zullinger <tmz@pobox.com>
|
|
Date: Wed, 15 Feb 2012 10:07:11 -0500
|
|
Subject: [PATCH/facter] (#12669) Preserve timestamps when installing files
|
|
|
|
Without the preserve option, ruby's FileUtils.install method uses the
|
|
current time for all installed files. For backup systems, package
|
|
installs, and general pedantic sysadmins, preserving timestamps makes a
|
|
small improvement in the world.
|
|
---
|
|
install.rb | 12 ++++++------
|
|
1 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/install.rb b/install.rb
|
|
index c5c3a11..909171f 100755
|
|
--- a/install.rb
|
|
+++ b/install.rb
|
|
@@ -103,7 +103,7 @@ def do_libs(libs, strip = 'lib/')
|
|
op = File.dirname(olf)
|
|
FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
|
|
FileUtils.chmod(0755, op)
|
|
- FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
|
|
+ FileUtils.install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true})
|
|
end
|
|
end
|
|
|
|
@@ -114,7 +114,7 @@ def do_man(man, strip = 'man/')
|
|
om = File.dirname(omf)
|
|
FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
|
|
FileUtils.chmod(0755, om)
|
|
- FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
|
|
+ FileUtils.install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true})
|
|
gzip = %x{which gzip}
|
|
gzip.chomp!
|
|
%x{#{gzip} -f #{omf}}
|
|
@@ -400,12 +400,12 @@ def install_binfile(from, op_file, target)
|
|
installed_wrapper = false
|
|
|
|
if File.exists?("#{from}.bat")
|
|
- FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
|
|
+ FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
|
|
installed_wrapper = true
|
|
end
|
|
|
|
if File.exists?("#{from}.cmd")
|
|
- FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :verbose => true)
|
|
+ FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :preserve => true, :verbose => true)
|
|
installed_wrapper = true
|
|
end
|
|
|
|
@@ -419,13 +419,13 @@ set RUBY_BIN=%RUBY_BIN:\\=/%
|
|
"%RUBY_BIN%ruby.exe" -x "%RUBY_BIN%facter" %*
|
|
EOS
|
|
File.open(tmp_file2.path, "w") { |cw| cw.puts cwv }
|
|
- FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
|
|
+ FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
|
|
|
|
tmp_file2.unlink
|
|
installed_wrapper = true
|
|
end
|
|
end
|
|
- FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :verbose => true)
|
|
+ FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :preserve => true, :verbose => true)
|
|
tmp_file.unlink
|
|
end
|
|
|
|
--
|
|
1.7.6
|
|
|