couple more fixes for ruby 1.9

diff --git a/bin/album2booh b/bin/album2booh
index 211694c4ec6671e86bad85887f00bc86836571ce..deb37dd73a5f10c663bb97b5656223a3a9cbf0a0 100644 (file)
--- a/bin/album2booh
+++ b/bin/album2booh
@@ -134,7 +134,7 @@ end
 
 def walk_source_dir
 
-    `find #{$source} -type d`.sort.each { |dir|
+    `find #{$source} -type d`.split.sort.each { |dir|
         dir.chomp!
         msg 2, _("Handling %s from config list...") % dir
 

diff --git a/bin/booh b/bin/booh
index a5db62400be49c1328256853e4959c054fa6ded1..2d69629d7313f01ccd22eafdd704fffdee33e619 100644 (file)
--- a/bin/booh
+++ b/bin/booh
@@ -2842,7 +2842,7 @@ def theme_choose(current)
 
     dialog.vbox.add(sw = Gtk::ScrolledWindow.new(nil, nil).add(treeview).set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC))
 
-    ([ $FPATH + '/themes/simple' ] + (`find '#{$FPATH}/themes' ~/.booh-themes -mindepth 1 -maxdepth 1 -type d 2>/dev/null`.find_all { |e| e !~ /simple$/ }.sort)).each { |dir|
+    ([ $FPATH + '/themes/simple' ] + (`find '#{$FPATH}/themes' ~/.booh-themes -mindepth 1 -maxdepth 1 -type d 2>/dev/null`.split.find_all { |e| e !~ /simple$/ }.sort)).each { |dir|
         dir.chomp!
         iter = model.append
         iter[0] = File.basename(dir)
@@ -2982,7 +2982,7 @@ def open_file(filename)
         mark_document_as_dirty
         if $xmldoc.root.attributes['version'] < '0.8.4'
             msg 1, _("File's version prior to 0.8.4, migrating directories and filenames in destination directory if needed")
-            `find '#{source}' -type d -follow`.sort.collect { |v| v.chomp }.each { |dir|
+            `find '#{source}' -type d -follow`.split.sort.collect { |v| v.chomp }.each { |dir|
                 old_dest_dir = make_dest_filename_old(dir.sub(/^#{Regexp.quote(source)}/, dest))
                 new_dest_dir = make_dest_filename(dir.sub(/^#{Regexp.quote(source)}/, dest))
                 if old_dest_dir != new_dest_dir

diff --git a/bin/booh-backend b/bin/booh-backend
index f55de76039b65dac5eca74ae45972168abd19ee6..03c6be739a2d011cb9606b7e7cb0a801f0641720 100755 (executable)
--- a/bin/booh-backend
+++ b/bin/booh-backend
@@ -804,9 +804,9 @@ def walk_source_dir
     if $mode == 'merge_config_onedir'
         examined_dirs = [ $onedir ]
     elsif $mode == 'merge_config_subdirs'
-        examined_dirs = `find '#{$onedir}' -type d -follow`.sort.collect { |v| v.chomp }.delete_if { |v| optxpath.has_key?(utf8(v)) }
+        examined_dirs = `find '#{$onedir}' -type d -follow`.split.sort.collect { |v| v.chomp }.delete_if { |v| optxpath.has_key?(utf8(v)) }
     else
-        examined_dirs = `find '#{$source}' -type d -follow`.sort.collect { |v| v.chomp }
+        examined_dirs = `find '#{$source}' -type d -follow`.split.sort.collect { |v| v.chomp }
         if $mode == 'merge_config'
             $xmldoc.elements.each('//dir') { |elem|
                 if ! examined_dirs.include?(elem.attributes['path'])

diff --git a/bin/booh-classifier b/bin/booh-classifier
index 7b25b5f0acd491d89a4facde665c9201859732ba..974f043ab6085c994e42453e035a90b679e6e576 100644 (file)
--- a/bin/booh-classifier
+++ b/bin/booh-classifier
@@ -1322,7 +1322,7 @@ def open_dir(*paths)
         $workingdir = path
         entries = []
         if File.directory?(path)
-            examined_dirs = `find '#{path}' -type d -follow`.sort.collect { |v| v.chomp }
+            examined_dirs = `find '#{path}' -type d -follow`.split.sort.collect { |v| v.chomp }
             #- validate first
             examined_dirs.each { |dir|
                 if dir =~ /'/

diff --git a/bin/webalbum2booh b/bin/webalbum2booh
index 61daaec6565adfbbcce4aa2e764081b258c917e7..eb11813bdf0fb4acaba3bec8c743663b1b320c7a 100644 (file)
--- a/bin/webalbum2booh
+++ b/bin/webalbum2booh
@@ -127,7 +127,7 @@ end
 
 def walk_source_dir
 
-    `find #{$source} -type d`.sort.each { |dir|
+    `find #{$source} -type d`.split.sort.each { |dir|
         dir.chomp!
         msg 2, _("Handling %s from config list...") % dir
 

diff --git a/lib/booh/booh-lib.rb b/lib/booh/booh-lib.rb
index cbead63b3ac86891af414a05223789e448c2fd37..08578da8e8556c502a9cbdff8d5f08f414b2a567 100644 (file)
--- a/lib/booh/booh-lib.rb
+++ b/lib/booh/booh-lib.rb
@@ -107,14 +107,14 @@ module Booh
         #- we remove non alphanumeric characters but need to do that
         #- cleverly to not end up with two similar dest filenames. we won't
         #- urlencode because urldecode might happen in the browser.
-        return orig_filename.unpack("C*").collect { |v| v.chr =~ /[a-zA-Z\-_0-9\.\/]/ ? v.chr : sprintf("%2X", v) }.to_s
+        return orig_filename.unpack("C*").collect { |v| v.chr =~ /[a-zA-Z\-_0-9\.\/]/ ? v.chr : sprintf("%2X", v) }.join
     end
 
     def make_dest_filename(orig_filename)
         #- we remove non alphanumeric characters but need to do that
         #- cleverly to not end up with two similar dest filenames. we won't
         #- urlencode because urldecode might happen in the browser.
-        return orig_filename.unpack("C*").collect { |v| v.chr =~ /[a-zA-Z\-_0-9\.\/]/ ? v.chr : sprintf("~%02X", v) }.to_s
+        return orig_filename.unpack("C*").collect { |v| v.chr =~ /[a-zA-Z\-_0-9\.\/]/ ? v.chr : sprintf("~%02X", v) }.join
     end
 
     def msg(verbose_level, msg)
@@ -535,7 +535,7 @@ module Booh
     def substInFile(name)
         newcontent = IO.readlines(name).collect { |l| yield l }
         ios = File.open(name, "w")
-        ios.write(newcontent)
+        ios.write(newcontent.join)
         ios.close
     end