[Xfce4-commits] <installit:installer-single-file> Port to ruby 1.9.

[Nick Schermer]

Updating branch refs/heads/installer-single-file
         to 1d668a71e34afa6f254ecf83bc6ec1fbb6746e73 (commit)
       from 63bcfe618e841388a8508710dc71534f38d5b6e6 (commit)

commit 1d668a71e34afa6f254ecf83bc6ec1fbb6746e73
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jan 17 13:07:12 2011 +0100

    Port to ruby 1.9.

 i2t-generate/InstallIt/Generator.rb |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/i2t-generate/InstallIt/Generator.rb b/i2t-generate/InstallIt/Generator.rb
index 5cee82f..39afeef 100644
--- a/i2t-generate/InstallIt/Generator.rb
+++ b/i2t-generate/InstallIt/Generator.rb
@@ -21,7 +21,8 @@
 # 02111-1307, USA.
 #
 
-require 'ftools'
+require 'fileutils'
+require 'pathname'
 
 require 'InstallIt/Generators/Bin'
 require 'InstallIt/Generators/Bootstrap'
@@ -52,34 +53,34 @@ module InstallIt
     def generate
       # create clean base directory
       Kernel::system("rm -rf \"#{@basedir}\"")
-      File.makedirs(@basedir)
+      FileUtils.mkdir_p(@basedir)
 
       # copy installer image files
       if @settings.appIcon then
-        File.copy("#{@settings.directory}/#{@settings.appIcon}", \
-                  "#{@basedir}/#{File.basename(@settings.appIcon)}")
+        FileUtils.cp("#{@settings.directory}/#{@settings.appIcon}", \
+                     "#{@basedir}/#{Pathname.new(@settings.appIcon).basename}")
       end
       if @settings.appLogo then
-        File.copy("#{@settings.directory}/#{@settings.appLogo}", \
-                  "#{@basedir}/#{File.basename(@settings.appLogo)}")
+        FileUtils.cp("#{@settings.directory}/#{@settings.appLogo}", \
+                     "#{@basedir}/#{Pathname.new(@settings.appLogo).basename}")
       end
 
       # copy extra dist files
       @settings.appExtraDist().each do |file|
-      	File.copy("#{@settings.directory}/#{file}", \
-      	          "#{@basedir}/#{file}")
+      	FileUtils.cp("#{@settings.directory}/#{file}", \
+      	             "#{@basedir}/#{file}")
       end
 
       # copy the xfi/ module files
-      File.makedirs("#{@basedir}/i2t")
+      FileUtils.mkdir_p("#{@basedir}/i2t")
       [ 'package.c', 'package.h', 'page.c', 'page.h', 'uninstaller.c',
         'uninstaller-icon.png', 'wizard.c', 'wizard.h' ].each do |file|
-        File.copy("#{InstallIt::Site.sourceDirectory()}/i2t-#{file}", \
-                  "#{@basedir}/i2t/i2t-#{file}")
+        FileUtils.cp("#{InstallIt::Site.sourceDirectory()}/i2t-#{file}", \
+                     "#{@basedir}/i2t/i2t-#{file}")
       end
       [ 'heading.c', 'heading.h', 'titled-dialog.c', 'titled-dialog.h' ].each do |file|
-        File.copy("#{InstallIt::Site.sourceDirectory()}/xfce-#{file}", \
-                   "#{@basedir}/i2t/xfce-#{file}")
+        FileUtils.cp("#{InstallIt::Site.sourceDirectory()}/xfce-#{file}", \
+                     "#{@basedir}/i2t/xfce-#{file}")
       end
         
       # generate the bootstrap.sh file