From e33e5a03619f65ee9531a78d5de20e3d703326e7 Mon Sep 17 00:00:00 2001
From: Elijah Perrault <elijah@starcoder.info>
Date: Fri, 11 Feb 2011 18:10:01 -0700
Subject: [PATCH] Revert "Moved modules to src/."

This reverts commit 8754f93b0819c04cbe55fcadbd1b53349ce6e75f.
This won't work. Time for a new idea.
---
 bin/buildmod                   | 9 ++++-----
 modules/{src => }/Badwords.pm  | 0
 modules/{src => }/Bitly.pm     | 0
 modules/{src => }/Calc.pm      | 0
 modules/{src => }/EightBall.pm | 0
 modules/{src => }/FML.pm       | 0
 modules/{src => }/HelloChan.pm | 0
 modules/{src => }/IsItUp.pm    | 0
 modules/{src => }/QDB.pm       | 0
 modules/{src => }/SASLAuth.pm  | 0
 modules/{src => }/Weather.pm   | 0
 11 files changed, 4 insertions(+), 5 deletions(-)
 rename modules/{src => }/Badwords.pm (100%)
 rename modules/{src => }/Bitly.pm (100%)
 rename modules/{src => }/Calc.pm (100%)
 rename modules/{src => }/EightBall.pm (100%)
 rename modules/{src => }/FML.pm (100%)
 rename modules/{src => }/HelloChan.pm (100%)
 rename modules/{src => }/IsItUp.pm (100%)
 rename modules/{src => }/QDB.pm (100%)
 rename modules/{src => }/SASLAuth.pm (100%)
 rename modules/{src => }/Weather.pm (100%)

diff --git a/bin/buildmod b/bin/buildmod
index c7e08da..a0069e6 100755
--- a/bin/buildmod
+++ b/bin/buildmod
@@ -21,13 +21,13 @@ my $module = $ARGV[0];
 # Set full path.
 my $type = 0;
 my $modulep;
-if (-e "$Bin/../modules/src/$module.pm") {
-    $modulep = "$Bin/../modules/src/$module.pm";
+if (-e "$Bin/../modules/$module.pm") {
+    $modulep = "$Bin/../modules/$module.pm";
     $type = 1;
 }
 else {
-    if (-e "$Bin/../modules/src/$module/Buildfile") {
-        $modulep = "$Bin/../modules/src/$module/Buildfile";
+    if (-e "$Bin/../modules/$module/Buildfile") {
+        $modulep = "$Bin/../modules/$module/Buildfile";
         $type = 2;
     }
     else {
@@ -117,7 +117,6 @@ foreach my $line (<$FHBM>) {
 }
 close $FHBM;
 
-$modulep =~ s/src\///g;
 open $FHBM, '>', $modulep;
 print {$FHBM} $db;
 close $FHBM;
diff --git a/modules/src/Badwords.pm b/modules/Badwords.pm
similarity index 100%
rename from modules/src/Badwords.pm
rename to modules/Badwords.pm
diff --git a/modules/src/Bitly.pm b/modules/Bitly.pm
similarity index 100%
rename from modules/src/Bitly.pm
rename to modules/Bitly.pm
diff --git a/modules/src/Calc.pm b/modules/Calc.pm
similarity index 100%
rename from modules/src/Calc.pm
rename to modules/Calc.pm
diff --git a/modules/src/EightBall.pm b/modules/EightBall.pm
similarity index 100%
rename from modules/src/EightBall.pm
rename to modules/EightBall.pm
diff --git a/modules/src/FML.pm b/modules/FML.pm
similarity index 100%
rename from modules/src/FML.pm
rename to modules/FML.pm
diff --git a/modules/src/HelloChan.pm b/modules/HelloChan.pm
similarity index 100%
rename from modules/src/HelloChan.pm
rename to modules/HelloChan.pm
diff --git a/modules/src/IsItUp.pm b/modules/IsItUp.pm
similarity index 100%
rename from modules/src/IsItUp.pm
rename to modules/IsItUp.pm
diff --git a/modules/src/QDB.pm b/modules/QDB.pm
similarity index 100%
rename from modules/src/QDB.pm
rename to modules/QDB.pm
diff --git a/modules/src/SASLAuth.pm b/modules/SASLAuth.pm
similarity index 100%
rename from modules/src/SASLAuth.pm
rename to modules/SASLAuth.pm
diff --git a/modules/src/Weather.pm b/modules/Weather.pm
similarity index 100%
rename from modules/src/Weather.pm
rename to modules/Weather.pm