hamradio/spider
1
0
Fork 0
mirror of git://scm.dxcluster.org/scm/spider synced 2024-09-21 07:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed perl Git package dependency

Browse Source
This commit is contained in:
Dirk Koopman 2021-12-11 12:51:37 +00:00
parent 2f876d1acd
commit d38c9fb5ca
2 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -1,3 +1,5 @@
11Dec21=======================================================================
1. Removed dependency on perl Git package.
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.

57
perl/cluster.pl
View File

@ -319,7 +319,7 @@ sub cease
$l->close_server;
}
LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitbranch/$gitversion) ended");
LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitbranch/$gitversion) on $^O ended");
dbgclose();
Logclose();
@ -399,34 +399,35 @@ if (DXSql::init($dsn)) {
import Encode;
$can_encode = 1;
}
eval { require Git; };
unless ($@) {
import Git;
# determine the real version number
$gitbranch = 'none';
$gitversion = 'none';
my $repo = Git->repository(Directory => "$root/.git");
if ($repo) {
my $desc = $repo->command_oneline(['describe'], STDERR => 0);
if ($desc) {
my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
$version = $v;
$subversion = $s || 0;
$build = $b || 0;
$gitversion = "$g\[r]";
}
}
my @branch = $repo->command([qw{branch}], STDERR=>0);
for (@branch) {
my ($star, $b) = split /\s+/;
if ($star eq '*') {
$gitbranch = $b;
last;
}
}
$gitbranch = 'none';
$gitversion = 'none';
# determine the real Git build number and branch
my $desc;
eval {$desc = `git describe --long`};
if (!$@ && $desc) {
my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
$version = $v;
my $subversion = $s || 0;
$build = $b || 0;
$gitversion = "$g\[r]";
}
if (!$@) {
my @branch;
eval {@branch = `git branch`};
unless ($@) {
for (@branch) {
my ($star, $b) = split /\s+/;
if ($star eq '*') {
$gitbranch = $b;
last;
}
}
}
}
$SIG{__DIE__} = $w;
}
@ -436,7 +437,7 @@ DXXml::init();
# banner
my ($year) = (gmtime)[5];
$year += 1900;
LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitbranch/$gitversion) started");
LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitbranch/$gitversion) on $^O started");
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
# load Prefixes