add mojo->master fallback compatibility

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 70c8e6606515015731646ccc4a3e6490cb51c0ef..343ba88d7d33218863798c7874c8a2d37e75340b 100644 (file)
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -293,5 +293,9 @@ sub run_cmd
                dbg("cmd out: $_") if isdbg('cron');
        }
 }
+
+# for fallback from mojo branch
+sub spawn_cmd {goto &run_cmd};
+
 1;
 __END__

diff --git a/perl/DXVars.pm.issue b/perl/DXVars.pm.issue
index 3f05a7b639ca18da495e34ef1a87736fafdf572e..d2ce8cbab9edf90b83ec10526f97d96063adeda2 100644 (file)
--- a/perl/DXVars.pm.issue
+++ b/perl/DXVars.pm.issue
@@ -1,4 +1,4 @@
-#
+# -*- perl -*-
 # The system variables - those indicated will need to be changed to suit your
 # circumstances (and callsign)
 #

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 3336d077482f0114d2558b8cc696dbbede4f612f..0db8e0bcb2e0d59354f276a41a5c2a21c098e333 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -12,6 +12,11 @@
 
 require 5.004;
 
+package main;
+
+# set default paths, these should be overwritten by DXVars.pm
+use vars qw($data $system $cmd $localcmd $userfn);
+
 # make sure that modules are searched in the order local then perl
 BEGIN {
        umask 002;
@@ -30,6 +35,11 @@ BEGIN {
 
        mkdir "$root/local_cmd", 0777 unless -d "$root/local_cmd";
 
+       $data = "$root/data";
+       $system = "$root/sys";
+       $cmd = "$root/cmd";
+       $localcmd = "$root/local_cmd";
+       $userfn = "$data/users";
 
        # try to create and lock a lockfile (this isn't atomic but
        # should do for now