From 59d5c36cba8d26ce2d2abda8bfcd4d5a8dbf9a27 Mon Sep 17 00:00:00 2001 From: Elijah Perrault Date: Fri, 11 Mar 2011 22:00:51 -0700 Subject: [PATCH] Added bin:mod, and module loading now works as desired. --- bin/auto | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/auto b/bin/auto index 57ead01..fb57960 100755 --- a/bin/auto +++ b/bin/auto @@ -31,12 +31,14 @@ BEGIN { $bin{lib} = "$Bin/../lib/autobot/3.0.0"; $bin{bld} = "$bin{lib}/build"; $bin{lng} = "$bin{lib}/lang"; + $bin{mod} = "$bin{lib}/modules"; } else { # Or not. $bin{lib} = "$Bin/../lib"; $bin{bld} = "$Bin/../build"; $bin{lng} = "$Bin/../lang"; + $bin{mod} = "$Bin/../modules"; } $UPREFIX = 1; } @@ -47,6 +49,7 @@ BEGIN { $bin{lib} = "$Bin/../lib"; $bin{bld} = "$Bin/../build"; $bin{lng} = "$Bin/../lang"; + $bin{mod} = "$Bin/../modules"; $UPREFIX = 0; } @@ -567,12 +570,12 @@ sub socksnd { sub mod_load { my ($module) = @_; - if (-e "$Bin/../modules/$module.pm") { - do "$Bin/../modules/$module.pm" and return 1; + if (-e "$bin{mod}/$module.pm") { + do "$bin{mod}/$module.pm" and return 1; } else { - if (-e "$Bin/../modules/$module/main.pm") { - do "$Bin/../modules/$module/main.pm" and return 1; + if (-e "$bin{mod}/$module/main.pm") { + do "$bin{mod}/$module/main.pm" and return 1; } }