Rework module paths

16 files changed, 15 insertions, 11 deletions

diff --git a/modules/classes.pl b/lib/ASM/Classes.pm
index 1054f63..1054f63 100644
--- a/modules/classes.pl
+++ b/lib/ASM/Classes.pm
diff --git a/modules/command.pl b/lib/ASM/Commander.pm
index aa79f4d..aa79f4d 100644
--- a/modules/command.pl
+++ b/lib/ASM/Commander.pm
diff --git a/modules/mysql.pl b/lib/ASM/DB.pm
index 86a1c78..86a1c78 100644
--- a/modules/mysql.pl
+++ b/lib/ASM/DB.pm
diff --git a/modules/event.pl b/lib/ASM/Event.pm
index e6f4c23..e6f4c23 100644
--- a/modules/event.pl
+++ b/lib/ASM/Event.pm
diff --git a/modules/inspect.pl b/lib/ASM/Inspect.pm
index df515dc..df515dc 100644
--- a/modules/inspect.pl
+++ b/lib/ASM/Inspect.pm
diff --git a/modules/log.pl b/lib/ASM/Log.pm
index c2a2b72..c2a2b72 100644
--- a/modules/log.pl
+++ b/lib/ASM/Log.pm
diff --git a/modules/services.pl b/lib/ASM/Services.pm
index 528901d..528901d 100644
--- a/modules/services.pl
+++ b/lib/ASM/Services.pm
diff --git a/modules/util.pl b/lib/ASM/Util.pm
index f9895a0..f9895a0 100644
--- a/modules/util.pl
+++ b/lib/ASM/Util.pm
diff --git a/modules/xml.pl b/lib/ASM/XML.pm
index 1128dda..1128dda 100644
--- a/modules/xml.pl
+++ b/lib/ASM/XML.pm
diff --git a/Net/IRC.pm b/lib/Net/IRC.pm
index 9e39458..9e39458 100644
--- a/Net/IRC.pm
+++ b/lib/Net/IRC.pm
diff --git a/Net/IRC/Connection.pm b/lib/Net/IRC/Connection.pm
index 6918bda..6918bda 100644
--- a/Net/IRC/Connection.pm
+++ b/lib/Net/IRC/Connection.pm
diff --git a/Net/IRC/DCC.pm b/lib/Net/IRC/DCC.pm
index eccbba3..eccbba3 100644
--- a/Net/IRC/DCC.pm
+++ b/lib/Net/IRC/DCC.pm
diff --git a/Net/IRC/Event.pm b/lib/Net/IRC/Event.pm
index 3359a2f..3359a2f 100644
--- a/Net/IRC/Event.pm
+++ b/lib/Net/IRC/Event.pm
diff --git a/Net/IRC/EventQueue.pm b/lib/Net/IRC/EventQueue.pm
index fdb7b44..fdb7b44 100644
--- a/Net/IRC/EventQueue.pm
+++ b/lib/Net/IRC/EventQueue.pm
diff --git a/Net/IRC/EventQueue/Entry.pm b/lib/Net/IRC/EventQueue/Entry.pm
index 94a3802..94a3802 100644
--- a/Net/IRC/EventQueue/Entry.pm
+++ b/lib/Net/IRC/EventQueue/Entry.pm
diff --git a/meta.pl b/meta.pl
index 00045a6..2e651d6 100755
--- a/meta.pl
+++ b/meta.pl
@@ -1,12 +1,11 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 
-use lib '/home/icxcnika/AntiSpamMeta';
-
-#use Devel::Profiler package_filter => sub { return 0 if $_[0] =~ /^XML::Simple/; return 1; };
+use strict;
+use warnings;
 
+use FindBin;
+use lib "$FindBin::Bin/lib";;
 
-use warnings;
-use strict;
 use Net::IRC;
 use Data::Dumper;
 use IO::All;
@@ -18,6 +17,16 @@ use feature qw(say);
 use HTTP::Async;
 use Carp;
 
+use ASM::Util;
+use ASM::XML;
+use ASM::Inspect;
+use ASM::Event;
+use ASM::Services;
+use ASM::Log;
+use ASM::Commander;
+use ASM::Classes;
+use ASM::DB;
+
 $Data::Dumper::Useqq=1;
 
 $::pass = '';
@@ -72,11 +81,6 @@ sub alarmdeath
 $SIG{ALRM} = \&alarmdeath;
 alarm 300;
 
-BEGIN {
-my @modules = qw/Util Xml Inspect Event Services Log Command Classes Mysql/;
-require 'modules/' . lc $_ . '.pl' foreach @modules;
-}
-
 sub init {
   my ( $conn, $host );
   my $irc = new Net::IRC;