X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite-dl.pl;h=8b1b161ca38fe6381008271d7fe4643be98d68e6;hb=88a58c0136ad9e42407fbe3996daaf4a4c82cceb;hp=ea7b99931f4eb08d6ffdbf7f033b22ce7efe4ae4;hpb=956c646c9b8521ecd81dee161f31307421ca9f27;p=videosite.git

diff --git a/videosite-dl.pl b/videosite-dl.pl
index ea7b999..8b1b161 100755
--- a/videosite-dl.pl
+++ b/videosite-dl.pl
@@ -24,13 +24,13 @@ sub ploader {
 
     foreach $p (@list) {
         $p =~ s/\.pm$//;
-        eval qq{ require $p; };
+        eval qq{ require videosite::$p; };
         if ($@) {
             print("Failed to load plugin: $@");
             next;
         }
 
-        $g = eval $p.q{->new();};
+        $g = eval qq{ videosite::$p->new();};
         if ($@) {
             print("Failed to instanciate: $@");
             delete($INC{$p});
@@ -59,11 +59,12 @@ my $bp;
 # This is some dark magic to find out our real base directory,
 # where we hope to find our plugins.
 $bp = File::Spec->catdir(dirname(realpath($0)), 'videosite');
+unshift(@INC, dirname(realpath($0)));
 
 @g = ploader($bp, '.*Grabber\.pm$', 'grabber');
 ($f) = ploader($bp, '^FileGetter\.pm$', 'getter');
 
-unless(defined(@g) and defined($f)) {
+unless(@g and defined($f)) {
     print("No plugins could be loaded\n");
     exit 1;
 }