From 6409be5b2fde49c21593f557b9174c7e465a422b Mon Sep 17 00:00:00 2001 From: James Estes Date: Sat, 1 Jan 2011 22:08:23 -0700 Subject: [PATCH] (#5747) Fix do_configs to use FileUtils when ftools missing This was failing the install for some setups without ftools. Followed the same pattern used in other parts of install.rb that had already added the check. --- install.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install.rb b/install.rb index 7627a8d11f7..e9cc9ebcab2 100755 --- a/install.rb +++ b/install.rb @@ -92,7 +92,11 @@ def do_configs(configs, target, strip = 'conf/') Dir.mkdir(target) unless File.directory? target configs.each do |cf| ocf = File.join(InstallOptions.config_dir, cf.gsub(/#{strip}/, '')) - File.install(cf, ocf, 0644, true) + if $haveftools + File.install(cf, ocf, 0644, true) + else + FileUtils.install(cf, ocf, {:mode => 0644, :verbose => true}) + end end end