ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweak regex's. add debug

This commit is contained in:
Andrew Bauer 2016-02-12 17:15:04 -06:00
parent 5045da9382
commit 3c48d81edb
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/zmtelemetry.pl.in
View File

@ -238,17 +238,17 @@ sub getDistro {
my $test = runSysCmd("uname");
if ( $test =~ /Linux/ ) {
#print "Linux distro.\n";
Debug("Linux distro detected.");
($kernel, $distro, $version) = linuxDistro();
} elsif ( $test =~ /.*BSD/ ) {
#print "BSD distro.\n";
Debug("BSD distro detected.");
$kernel = runSysCmd("uname -i");
$distro = runSysCmd("uname");
$version = runSysCmd("uname -r");
} elsif ( $test =~ /Darwin/ ) {
#print "Mac OS.\n";
Debug("Mac OS distro detected.");
} elsif ( $test =~ /SunOS|Solaris/ ) {
#print "Sun Solaris.\n";
Debug("Sun Solaris detected.");
$kernel = runSysCmd("uname -v");
$distro = runSysCmd("uname");
$version = runSysCmd("uname -r");
@ -275,12 +275,12 @@ sub linuxDistro {
if ( -f "/etc/os-release" ) {
open(my $RELFILE,"<","/etc/os-release") or die( "Can't Open file: $!\n" );
while (<$RELFILE>) {
if ( /PRETTY_NAME=\"?(.*)\"?.*/ ) {
$distro = $1;
if ( /^NAME=(")?(.*)(?(1)\1|).*$/ ) {
$distro = $2;
$found = 1;
}
if ( /VERSION_ID=\"?(.*)\"?.*/ ) {
$version = $1;
if ( /^VERSION_ID=(")?(.*)(?(1)\1|).*$/ ) {
$version = $2;
$found = 1;
}
}
@ -289,12 +289,12 @@ sub linuxDistro {
} elsif ( -f "/etc/lsb-release" ) {
open(my $RELFILE,"<","/etc/lsb-release") or die( "Can't Open file: $!\n" );
while (<$RELFILE>) {
if ( /DISTRIB_DESCRIPTION=\"?(.*)\"?.*/ ) {
$distro = $1;
if ( /^DISTRIB_DESCRIPTION=(")?(.*)(?(1)\1|).*$/ ) {
$distro = $2;
$found = 1;
}
if ( /DISTRIB_RELEASE=\"?(.*)\"?.*/ ) {
$version = $1;
if ( /^DISTRIB_RELEASE=(")?(.*)(?(1)\1|).*$/ ) {
$version = $2;
$found = 1;
}
}