Changeset 94 for branches/rakefile-work/convertdb.rb

Timestamp:

07/24/08 19:47:42 (4 months ago)

Author:

deveiant

Message:

Updated build system

Files:

• branches/rakefile-work/convertdb.rb (modified) (1 diff)

branches/rakefile-work/convertdb.rb

@@ -111 +111 @@
         default = nil
         wndirs = Pathname.glob( Pathname.getwd + 'WordNet-*' )
-        unless wndirs.empty?
-            default = wndirs.first
+        localdict = Pathname.getwd + 'dict'
+        if !wndirs.empty?
+            default = wndirs.first + 'dict'
+        elsif localdict.exist?
+            default = localdict
         else
-            default = '/usr/local/WordNet-3.0'
-        end
-
-        # :TODO: Do some more intelligent searching here
+            default = '/usr/local/WordNet-3.0/dict'
+        end
+
         message "Where can I find the WordNet data files?\n"
-        datadir = prompt_with_default( "Data directory", default + "/dict" )
+        datadir = prompt_with_default( "Data directory", default )
         datadir = Pathname.new( datadir )