From 5412eab12df89a7a701ffea4f5dfb98d0f56985e Mon Sep 17 00:00:00 2001 From: Stéphan Gorget Date: Thu, 5 Nov 2009 00:51:34 +0100 Subject: Fixed : 2788 - ftools missing in Ruby 1.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphan Gorget --- install.rb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/install.rb b/install.rb index ec16c4b..1280f04 100755 --- a/install.rb +++ b/install.rb @@ -35,7 +35,13 @@ require 'rbconfig' require 'find' require 'fileutils' -require 'ftools' # apparently on some system ftools doesn't get loaded +begin + require 'ftools' # apparently on some system ftools doesn't get loaded + $haveftools = true +rescue LoadError + puts "ftools not found. Using FileUtils instead.." + $haveftools = false +end require 'optparse' require 'ostruct' @@ -91,9 +97,15 @@ def do_libs(libs, strip = 'lib/') libs.each do |lf| olf = File.join(InstallOptions.site_dir, lf.gsub(/#{strip}/, '')) op = File.dirname(olf) - File.makedirs(op, true) - File.chmod(0755, op) - File.install(lf, olf, 0644, true) + if $haveftools + File.makedirs(op, true) + File.chmod(0755, op) + File.install(lf, olf, 0644, true) + else + FileUtils.makedirs(op, {:mode => 0755, :verbose => true}) + FileUtils.chmod(0755, op) + FileUtils.install(lf, olf, {:mode => 0644, :verbose => true}) + end end end -- cgit