Apply Tadgy's patch to update the hardcoded file paths.

7 files changed, 32 insertions, 31 deletions

diff --git a/Manpages/config.py b/Manpages/config.py
index b0ab3ff..825a989 100644
--- a/Manpages/config.py
+++ b/Manpages/config.py
@@ -30,7 +30,7 @@ Manpages = conf.registerPlugin('Manpages')
 #     registry.Boolean(False, _("""Help for someConfigVariableName.""")))
 
 conf.registerGlobalValue(Manpages, 'dbpath',
-    registry.String("/home/slackfacts/supybot/Manpages.sqlite3", _("""Path to sqite3 database.""")))
+    registry.String("/home/ibob/bot/Manpages.sqlite3", _("""Path to sqite3 database.""")))
 
 conf.registerGlobalValue(Manpages, 'maxresults',
     registry.Integer(5, _("""Maximum number of results to send to client.""")))
diff --git a/README.txt b/README.txt
index 26054dd..c34e050 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 limnoria.slackfacts.plugins README
 
 This is a collection of Slackware-specific bot plugins for the
-slackfacts bot, which lives in ##slackware and ##slackware.uk on
+ibob bot, which lives in ##slackware and ##slackware.uk on
 irc.libera.chat.
 
 Commands supported are:
@@ -42,18 +42,18 @@ Examples:
 -- Search all manual sections:
 
 <user> !man printf
-<slackfacts> user: printf(1): format and print data | printf(3): formatted
+<ibob> user: printf(1): format and print data | printf(3): formatted
              output conversion
 
 -- Search only one manual section:
 
 <user> !man 3 printf
-<slackfacts> user: printf(3): formatted output conversion
+<ibob> user: printf(3): formatted output conversion
 
 -- Find files. This is a substring match, so:
 
 <user> !locate /bin/ls
-<slackfacts> user: /bin/ls | /bin/lsblk | /bin/lsmod [l] | /usr/bin/ls [l] |
+<ibob> user: /bin/ls | /bin/lsblk | /bin/lsmod [l] | /usr/bin/ls [l] |
              /usr/bin/lsattr | /usr/bin/lsb [l] | [too many results, only
              showing first 5]
 
@@ -62,12 +62,12 @@ Examples:
 -- Find the ls command:
 
 <user> !which ls
-<slackfacts> user: /bin/ls | /usr/bin/ls [l]
+<ibob> user: /bin/ls | /usr/bin/ls [l]
 
 -- Find packages by name, search all categories:
 
 <user> !pkgsearch core
-<slackfacts> user: a/coreutils: core GNU utilities | kde/nepomuk-core:
+<ibob> user: a/coreutils: core GNU utilities | kde/nepomuk-core:
              Nepomuk Core utilities and libraries | l/at-spi2-core:
              Assistive Technology Service Provider Interface core |
              l/xapian-core: Search Engine Library
@@ -77,14 +77,14 @@ With no options, !pkg is a synonym for !pkgsearch.
 -- Find packages by name, search one category:
 
 <user> !pkgsearch a/core
-<slackfacts> user: a/coreutils: core GNU utilities
+<ibob> user: a/coreutils: core GNU utilities
 
 -- Find which package owns a file. This is an exact match if you give an
    absolute path (if the search term starts with a slash), or a substring
    match otherwise. You can also use * for globbing (e.g. /bin/ls*).
 
 <user> !filesearch /bin/ls
-<slackfacts> user: a/coreutils: core GNU utilities
+<ibob> user: a/coreutils: core GNU utilities
 
 !pkg -f is a synonym for !filesearch.
 
@@ -92,7 +92,7 @@ With no options, !pkg is a synonym for !pkgsearch.
 globbing/wildcards allowed):
 
 <user> !srcsearch coreutils
-<slackfacts> user:
+<ibob> user:
              https://slackware.uk/slackware/slackware64-14.2/source/a/coreutils/
 
 !pkg -s is a synonym for !srcsearch.
@@ -101,5 +101,5 @@ If there had been an updated coreutils in patches/, the updated version's
 source would have been found. For instance:
 
 <user> !srcsearch irssi
-<slackfacts> user:
+<ibob> user:
              https://slackware.uk/slackware/slackware64-14.2/patches/source/irssi/
diff --git a/SBoTools/config.py b/SBoTools/config.py
index d07f840..f68f5ab 100644
--- a/SBoTools/config.py
+++ b/SBoTools/config.py
@@ -30,7 +30,7 @@ SBoTools = conf.registerPlugin('SBoTools')
 #     registry.Boolean(False, _("""Help for someConfigVariableName.""")))
 
 conf.registerGlobalValue(SBoTools, 'dbpath',
-    registry.String("/home/slackfacts/supybot/SBoTools.sqlite3", _("""Path to sqite3 database.""")))
+    registry.String("/home/ibob/bot/SBoTools.sqlite3", _("""Path to sqite3 database.""")))
 
 conf.registerGlobalValue(SBoTools, 'maxresults',
     registry.Integer(5, _("""Maximum number of results for sbosearch command""")))
diff --git a/SlackTools/config.py b/SlackTools/config.py
index 1068a78..c321295 100644
--- a/SlackTools/config.py
+++ b/SlackTools/config.py
@@ -30,13 +30,13 @@ SlackTools = conf.registerPlugin('SlackTools')
 #     registry.Boolean(False, _("""Help for someConfigVariableName.""")))
 
 conf.registerGlobalValue(SlackTools, 'dbpath',
-    registry.String("/home/slackfacts/supybot/SlackTools.sqlite3", _("""Path to sqite3 database.""")))
+    registry.String("/home/ibob/bot/SlackTools.sqlite3", _("""Path to sqite3 database.""")))
 
 conf.registerGlobalValue(SlackTools, 'maxresults',
     registry.Integer(5, _("""Maximum number of results to send to client.""")))
 
 conf.registerGlobalValue(SlackTools, 'slackpath',
-    registry.String("/data/mirrors/slackware/slackware64-14.2", _("""Filesystem path to Slackware mirror (NO trailing slash!)""")))
+    registry.String("/data/depository/slackware/slackware64-15.0", _("""Filesystem path to Slackware mirror (NO trailing slash!)""")))
 
 conf.registerGlobalValue(SlackTools, 'baseurl',
-    registry.String("https://slackware.uk/slackware/slackware64-14.2", _("""Web URL of Slackware mirror (NO trailing slash!)""")))
+    registry.String("https://slackware.uk/slackware/slackware64-15.0", _("""Web URL of Slackware mirror (NO trailing slash!)""")))
diff --git a/bin/makepkgdb.pl b/bin/makepkgdb.pl
index 3791787..83e441c 100755
--- a/bin/makepkgdb.pl
+++ b/bin/makepkgdb.pl
@@ -8,9 +8,9 @@
 
 # the output is a huge pile of SQL insert statements, like half
 # a million of them. best way to run this IMO:
-# $ makepkgdb.pl > db.sql
-# $ rm -f /path/to/dbfile
-# $ sqlite3 -bail /path/to/dbfile < db.sql
+# $ makepkgdb.pl > ~/tmp/makepkgdb.sql
+# $ rm -f ~/bot/SlackTools.sqlite3
+# $ sqlite3 -bail ~/bot/SlackTools.sqlite3 <~/tmp/makepkgdb.sql
 
 # this script was only tested for slackware 14.2. When 15.0 gets
 # released, we'll rebuild the database using this script, which
@@ -22,8 +22,8 @@
 ### configurables:
 
 @pkglists = (
-	'/data/mirrors/slackware/slackware64-15.0/PACKAGES.TXT',
-	'/data/mirrors/slackware/slackware64-15.0/extra/PACKAGES.TXT',
+	'/data/depository/slackware/slackware64-15.0/PACKAGES.TXT',
+	'/data/depository/slackware/slackware64-15.0/extra/PACKAGES.TXT',
 );
 
 # ...the above list could have included pasture and testing, but
@@ -32,8 +32,8 @@
 
 # these 2 are copies of /var/log/packages and /var/log/scripts from
 # a full install of 15.0, with no 3rd-party packages added:
-$pkgdir = "/home/slackfacts/var.log/packages";
-$scriptsdir = "/home/slackfacts/var.log/scripts";
+$pkgdir = "/home/ibob/tmp/packages-15.0/";
+$scriptsdir = "/home/ibob/tmp/scripts-15.0/";
 
 ### end configurables.
 
diff --git a/bin/sbotools-update-db.sh b/bin/sbotools-update-db.sh
index ec6a22f..90f4be3 100755
--- a/bin/sbotools-update-db.sh
+++ b/bin/sbotools-update-db.sh
@@ -2,16 +2,17 @@
 
 # update the SBoTools.sqlite3 for the SBoTools limnoria plugin.
 # should be run from cron probably daily. also can be run manually.
-# run this as the slackfacts user, not root.
+# run this as the ibob user, not root.
 
 # configurables:
-BOTDIR=/home/slackfacts/supybot
+HOMEDIR=/home/ibob
+BOTDIR=$HOMEDIR/bot
 DBFILE=$BOTDIR/SBoTools.sqlite3
-SCRIPT=$BOTDIR/limnoria.slackfacts.plugins/bin/sbodb.pl
-SBOTREE=/data/mirrors/slackbuilds.org/15.0
+SCRIPT=$HOMEDIR/bot-plugins/limnoria.slackfacts.plugins/bin/sbodb.pl
+SBOTREE=/data/depository/sbo/15.0
 SQLITE3=/usr/bin/sqlite3
-LOG=$BOTDIR/sbotools-update-db.log
-DATEFILE=$BOTDIR/sbotools-update-db.lastdate
+LOG=$BOTDIR/logs/plugins/sbotools-update-db.log
+DATEFILE=$BOTDIR/SBoTools.lastdate
 
 # 1st line of ChangeLog.txt is the date of the last SBo update.
 head -n 1 $SBOTREE/ChangeLog.txt > $DATEFILE.new
diff --git a/bin/whatis2sqlite.pl b/bin/whatis2sqlite.pl
index d5f1c6c..fbab358 100755
--- a/bin/whatis2sqlite.pl
+++ b/bin/whatis2sqlite.pl
@@ -5,8 +5,8 @@
 
 # Usage:
 
-# $ rm -f /path/to/Manpages.sqlite3
-# $ perl whatis2sqlite.pl [whatis-file] | sqlite /path/to/Manpages.sqlite3
+# $ rm -f ~/bot/Manpages.sqlite3
+# $ perl whatis2sqlite.pl ~/tmp/whatis-15.0 | sqlite ~/bot/Manpages.sqlite3
 
 # then reload the Manpages plugin in the bot.
 
@@ -16,7 +16,7 @@
 # in "man whatis":
 
 # /etc/cron.daily/man-db
-# whatis -w '*' | sort -u > whatis
+# whatis -w '*' | sort -u > whatis-15.0
 
 push @ARGV, 'whatis' unless @ARGV;