this packaging stuff seems to actually be working

[user/henk/code/ruby/rbot.git] / lib / rbot / ircbot.rb

diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb
index 89746af36c547be40f3786807ba60cd584807fcb..e211ca5309703ad9c61c84acddc43b310e2af099 100644 (file)
--- a/lib/rbot/ircbot.rb
+++ b/lib/rbot/ircbot.rb
@@ -80,8 +80,8 @@ class IrcBot
 
   # create a new IrcBot with botclass +botclass+
   def initialize(botclass)
-    unless Config::DATA_DIR && FileTest.directory? Config::DATA_DIR
-      puts "no data directory '#{Config::DATA_DIR}' found, did you run install.rb?"
+    unless FileTest.directory? Config::DATADIR
+      puts "no data directory '#{Config::DATADIR}' found, did you run install.rb?"
       exit 2
     end
     
@@ -94,7 +94,7 @@ class IrcBot
         puts "Error: file #{botclass} exists but isn't a directory"
         exit 2
       end
-      FileUtils.cp_r Config::DATA_DIR+'/templates', botclass
+      FileUtils.cp_r Config::DATADIR+'/templates', botclass
     end
     
     Dir.mkdir("#{botclass}/logs") if(!File.exist?("#{botclass}/logs"))