fix SysVar.pm problems (maybe)

diff --git a/Changes b/Changes
index 5d16d91f64bc95ae9596d1b32136893456afdc61..60e1d87cf7f53a20d5f9fe10e997110dc77ab6da 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+15Feb17=======================================================================
+1. Update UPGRADE.mojo a bit
+2. Fix(?) problems picking up SysVar.pm variables.  
 02Jan17=======================================================================
 1. Add CTY-2615 prefixes
 2. Add rbn.pl - an experimental rbn deduplicating spot filter. 

diff --git a/UPGRADE.mojo b/UPGRADE.mojo
index 6e5047fbc8d0b84904cd9b968823b3be59f9b085..c6d3d3390f658e0b6c66895bd67d7735579c54ff 100644 (file)
--- a/UPGRADE.mojo
+++ b/UPGRADE.mojo
@@ -42,6 +42,8 @@ Prerequisites:
 Install cpamminus:
 
        sudo apt-get install cpanminus
+or
+    wget -O - https://cpanmin.us | perl - --sudo App::cpanminus
 or
        sudo apt-get install curl
        curl -L https://cpanmin.us | perl - --sudo App::cpanminus

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 4222132c2b982bee9fe2490d99cab9ca184ab224..ca73a8249e81017c3705c34689f156294d7afff8 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -19,6 +19,12 @@ use warnings;
 BEGIN {
        umask 002;
 
+       # take into account any local::lib that might be present
+       eval {
+               require local::lib;
+       };
+       import local::lib unless ($@);
+
        # root of directory tree for this system
        $root = "/spider";
        $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
@@ -59,12 +65,11 @@ BEGIN {
        $systime = time;
 }
 
-                       
-use Mojo::IOLoop;
-
 use DXVars;
 use SysVar;
 
+use Mojo::IOLoop;
+
 use Msg;
 use IntMsg;
 use Internet;

diff --git a/perl/rbn.pl b/perl/rbn.pl
index ee960f4dcb3d5f1581775f61be84294a41c6d52f..8438b8e6549b3f3087756df762b28c03cc614542 100755 (executable)
--- a/perl/rbn.pl
+++ b/perl/rbn.pl
@@ -74,8 +74,8 @@ for ($attempts = 1; $attempts <= 5; ++$attempts) {
 
 die "ADMIN,Cannot connect to $host:$port after 5 attempts $!" unless $sock;
 say "ADMIN,connected" if $dbg;
-print $sock "$mycall\r\n";
-say "ADMIN,call sent" if $dbg;
+#print $sock "$mycall\r\n";
+#say "ADMIN,call $mycall sent" if $dbg;
 
 my %d;
 my %spot;
@@ -92,6 +92,11 @@ while (<$sock>) {
        # parse line
        say "RAW,$_" if $wantraw;
 
+       if (/call:/) {
+print $sock "$mycall\r\n";
+say "ADMIN,call $mycall sent" if $dbg;
+       }
+
        my (undef, undef, $origin, $qrg, $call, $mode, $s, $m, $spd, $u, $sort, $t, $tx) = split /[:\s]+/;
        if ($t || $tx) {