start new 'simon' branch; add our own files, originally from the old blootbot package...

Signed-off-by: Simon Kjikàqawej Côté <simon.raven@gmail.com>
git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@1872 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/files/directories b/files/directories
new file mode 100644 (file)
index 0000000..a7f6cfe
--- /dev/null
+++ b/files/directories
@@ -0,0 +1,13 @@
+$bot_state_dir = '/home/ravenbird/infobot/files';
+$bot_data_dir  = '/home/ravenbird/infobot/files';
+$bot_src_dir   = '/home/ravenbird/infobot/src';
+$bot_log_dir   = '/home/ravenbird/infobot/log';
+$bot_run_dir   = '/home/ravenbird/infobot';
+#    $bot_base_dir     ||= '/home/ravenbird/infobot';                  # '.'
+#    $bot_config_dir   ||= '/home/ravenbird/infobot/files';    # 'files/'
+#    $bot_data_dir     ||= '/home/ravenbird/infobot/files';    # 'files/'
+#    $bot_state_dir    ||= '/home/ravenbird/infobot/files';    # 'files/'
+#    $bot_run_dir      ||= '/home/ravenbird/infobot';                  # '.'
+#    $bot_src_dir      ||= "/home/ravenbird/infobot/src";              # $bot_base_dir/src
+#    $bot_log_dir      ||= "/home/ravenbird/infobot/log";              # $bot_base_dir/log
+#    $bot_misc_dir     ||= "/home/ravenbird/infobot/files";    # $bot_base_dir/files

diff --git a/infobot b/infobot
index 7fc8989620ba232a27501471b6ebb4502ede2bd2..eaa866e99c2024dcd7254e8ee3d159b123f63bbb 100755 (executable)
--- a/infobot
+++ b/infobot
@@ -19,17 +19,23 @@ BEGIN {
     }
 
     # set any $bot_*_dir var's that aren't already set
-    $bot_base_dir   ||= '.';
-    $bot_config_dir ||= 'files/';
-    $bot_data_dir   ||= 'files/';
-    $bot_state_dir  ||= 'files/';
-    $bot_run_dir    ||= '.';
+    $bot_base_dir      ||= '/SOME/DIRECTORY/HERE';
+    $bot_config_dir    ||= "$bot_base_dir/files/";
+    $bot_data_dir      ||= "$bot_base_dir/files/";
+    $bot_state_dir     ||= "$bot_base_dir/files/";
+    $bot_run_dir           ||= "$bot_base_dir";
     $bot_src_dir    ||= "$bot_base_dir/src";
     $bot_log_dir    ||= "$bot_base_dir/log";
-    $bot_misc_dir   ||= "$bot_base_dir/files";
+    $bot_misc_dir      ||= "$bot_base_dir/files";
+
+    require "$bot_config_dir/directories";
 
     $bot_pid = $$;
 
+    $bot_base_dir = $bot_state_dir;
+
+       unshift @INC,"$bot_src_dir","$bot_src_dir/Modules";
+
     require "$bot_src_dir/logger.pl";
     require "$bot_src_dir/core.pl";
     require "$bot_src_dir/modules.pl";
@@ -104,5 +110,3 @@ sub duperuncheck {
 }
 
 1;
-
-# vim:ts=4:sw=4:expandtab:tw=80