*** empty log message ***
authorgc <gc>
Fri, 6 May 2005 22:18:52 +0000 (22:18 +0000)
committergc <gc>
Fri, 6 May 2005 22:18:52 +0000 (22:18 +0000)
bin/booh
lib/booh/booh-lib.rb

index 42db25d6debb8694ade924f53d96957748546c4b..8211ca5759eec0d1783abdaa81a5270063ca45ca 100755 (executable)
--- a/bin/booh
+++ b/bin/booh
@@ -377,8 +377,8 @@ def walk_source_dir
             entries = Dir.entries(dir).sort
             #- populate config in case of gen_config, add new files in case of merge_config
             for file in entries
-                if file =~ /['"\(\)\[\]]/
-                    msg 1, _("Ignoring %s, contains one of forbidden characters: '\"()[]") % "#{dir}/#{file}"
+                if file =~ /['"\[\]]/
+                    msg 1, _("Ignoring %s, contains one of forbidden characters: '\"[]") % "#{dir}/#{file}"
                 else
                     type = entry2type(file)
                     if type && !xmldir.elements["#{type}[@filename='#{utf8(file)}']"]
index 464fe77dae1be01217613e667b7e7003d5c254ac..8eda1e45a967d6049b3da8f7fba6faf7214255bf 100644 (file)
@@ -115,9 +115,9 @@ module Booh
     end
 
     def entry2type(entry)
-        if entry =~ /\.(jpg|jpeg|jpe|gif|bmp|png)$/i && entry !~ /['"\(\)\[\]]/
+        if entry =~ /\.(jpg|jpeg|jpe|gif|bmp|png)$/i && entry !~ /['"\[\]]/
             return 'image'
-        elsif entry =~ /\.(mov|avi|mpg|mpeg|mpe|wmv|asx)$/i && entry !~ /['"\(\)\[\]]/
+        elsif entry =~ /\.(mov|avi|mpg|mpeg|mpe|wmv|asx)$/i && entry !~ /['"\[\]]/
             #- might consider using file magic later..
             return 'video'
         else