defend against ruby-1.8.4

diff --git a/bin/booh b/bin/booh
index 3aecac7a0a252224d859081cb5b7522679f86152..56f10f3fd6fbaafe55a8b737cfee36c966155fa0 100755 (executable)
--- a/bin/booh
+++ b/bin/booh
@@ -4536,6 +4536,12 @@ def create_main_window
     $main_window.show_all
 end
 
     $main_window.show_all
 end
 

+c = ::Config::CONFIG
+if c['MAJOR'] == '1' && c['MINOR'] == '8' && c['TEENY'] == '4'
+    puts _("Ruby 1.8.4 was detected. This version has a severely broken REXML library. Please downgrade or upgrade ruby to a different version.")
+    exit(1)
+end
+

 Thread.abort_on_exception = true
 
 handle_options
 Thread.abort_on_exception = true
 
 handle_options

diff --git a/bin/booh-backend b/bin/booh-backend
index 161f3d0ecfa5e19daf7f85e1f5d5af859b4719e5..30aafa72eb59911f5cc7aa6416d5da0f9c8d3e00 100755 (executable)
--- a/bin/booh-backend
+++ b/bin/booh-backend
@@ -1048,7 +1048,9 @@ def walk_source_dir
             if images.size > 0
                 captions4js = find_captions(xmldir, images).collect { |e| e ? '"' + e.gsub('"', '\"') + '"' : '""' }.join(', ')
                 thumbnailspage4js = image2thumbnailpage4js.collect { |e| "\"#{e}\"" }.join(', ')
             if images.size > 0
                 captions4js = find_captions(xmldir, images).collect { |e| e ? '"' + e.gsub('"', '\"') + '"' : '""' }.join(', ')
                 thumbnailspage4js = image2thumbnailpage4js.collect { |e| "\"#{e}\"" }.join(', ')

-
+                exifs = images.collect { |i|
+                    utf8(`identify -format "%[EXIF:*]" #{fullpath}`.sub(/MakerNote.*\n/, '')),
+                }

                 for sizeobj in $images_size
                     html = $html_images.collect { |l| l.clone }
                     images4js = fullscreen_images[sizeobj['name']].collect { |e| "\"#{e}\"" }.join(', ')
                 for sizeobj in $images_size
                     html = $html_images.collect { |l| l.clone }
                     images4js = fullscreen_images[sizeobj['name']].collect { |e| "\"#{e}\"" }.join(', ')


@@ -1250,6 +1252,12 @@ def walk_source_dir
     msg 3, _(" all done.")
 end
 
     msg 3, _(" all done.")
 end
 

+c = ::Config::CONFIG
+if c['MAJOR'] == '1' && c['MINOR'] == '8' && c['TEENY'] == '4'
+    puts _("Ruby 1.8.4 was detected. This version has a severely broken REXML library. Please downgrade or upgrade ruby to a different version.")
+    exit(1)
+end
+

 handle_options
 read_config
 check_installation
 handle_options
 read_config
 check_installation