1. Removed dependency on perl Git package.
2. Force code to change directory to $DXSPIDER_ROOT || '/spider'. Also force
git -C $root describe.
3. Change git commands AGAIN to work on old perls (which mojo won't work on,
but it makes my life easier).
4. Change version strings to include the perl version in use.
1. Removed dependency on perl Git package.
2. Force code to change directory to $DXSPIDER_ROOT || '/spider'. Also force
git -C $root describe.
1. Removed dependency on perl Git package.
2. Force code to change directory to $DXSPIDER_ROOT || '/spider'. Also force
git -C $root describe.
+3. Change git commands AGAIN to work on old perls (which mojo won't work on,
+ but it makes my life easier).
+4. Change version strings to include the perl version in use.
10Dec21=======================================================================
1. Fix the output of set/dxgrid, set/usstate and set/dxcq or set/dxitu to how
it was always supposed to be since 2003.
10Dec21=======================================================================
1. Fix the output of set/dxgrid, set/usstate and set/dxcq or set/dxitu to how
it was always supposed to be since 2003.
} else {
my ($year) = (gmtime($main::systime))[5];
$year += 1900;
} else {
my ($year) = (gmtime($main::systime))[5];
$year += 1900;
- push @out, "DX Spider Cluster version $main::version (build $main::build git: $main::gitbranch/$main::gitversion) on \u$^O";
+ push @out, "DXSpider v$main::version (build $main::build git: $main::gitbranch/$main::gitversion) using perl $^V on \u$^O";
push @out, "Copyright (c) 1998-$year Dirk Koopman G1TLH";
}
push @out, "Copyright (c) 1998-$year Dirk Koopman G1TLH";
}
sub check_add_node
{
my $call = shift;
sub check_add_node
{
my $call = shift;
# add this station to the user database, if required (don't remove SSID from nodes)
my $user = DXUser::get_current($call);
# add this station to the user database, if required (don't remove SSID from nodes)
my $user = DXUser::get_current($call);
$user->lockout(1);
$user->homenode($call);
$user->node($call);
$user->lockout(1);
$user->homenode($call);
$user->node($call);
+ $user->sort($type || 'A');
$user->lastin($main::systime); # this make it last longer than just this invocation
$user->put; # just to make sure it gets written away!!!
}
$user->lastin($main::systime); # this make it last longer than just this invocation
$user->put; # just to make sure it gets written away!!!
}
}
} else {
dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
}
} else {
dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
+ my $user = check_add_node($call, 'U');
@rout = $parent->add_user($call, Route::here($here), $ip);
$dxchan->tell_buddies('loginb', $call, $ncall) if $dxchan;
my $r = Route::User::get($call);
@rout = $parent->add_user($call, Route::here($here), $ip);
$dxchan->tell_buddies('loginb', $call, $ncall) if $dxchan;
my $r = Route::User::get($call);
dbg("Buffer empty, just close $call") if $dbg;
_close_it($conn);
}
dbg("Buffer empty, just close $call") if $dbg;
_close_it($conn);
}
dbg((ref $conn) . " socket missing on $conn->{call}") if $dbg;
_close_it($conn);
}
dbg((ref $conn) . " socket missing on $conn->{call}") if $dbg;
_close_it($conn);
}
return (\@dnodes, \@dusers, \@nnodes, \@nusers);
}
return (\@dnodes, \@dusers, \@nnodes, \@nusers);
}
sub new
{
my $pkg = shift;
sub new
{
my $pkg = shift;
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) on $^O ended");
+ LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O ended");
dbg("bye bye everyone - bye bye");
dbgclose();
Logclose();
dbg("bye bye everyone - bye bye");
dbgclose();
Logclose();
# determine the real Git build number and branch
my $desc;
# determine the real Git build number and branch
my $desc;
- eval {$desc = `git -C $root describe --long`};
+ eval {$desc = `git --git-dir=$root/.git describe --long`};
if (!$@ && $desc) {
my ($v, $s, $b, $g) = $desc =~ /^([\d\.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
$version = $v;
if (!$@ && $desc) {
my ($v, $s, $b, $g) = $desc =~ /^([\d\.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
$version = $v;
-
- eval {@branch = `git -C $root branch`};
+
+ eval {@branch = `git --git-dir=$root/.git branch`};
unless ($@) {
for (@branch) {
my ($star, $b) = split /\s+/;
unless ($@) {
for (@branch) {
my ($star, $b) = split /\s+/;
# banner
my ($year) = (gmtime)[5];
$year += 1900;
# banner
my ($year) = (gmtime)[5];
$year += 1900;
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) on $^O started");
+ LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O started");
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
# load Prefixes
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
# load Prefixes