| Line 183... |
Line 183... |
| 183 |
# Version 3.5.4 20200317 RWR
|
183 |
# Version 3.5.4 20200317 RWR
|
| 184 |
# changed so report->version will show the version of sysinfo, not the data version
|
184 |
# changed so report->version will show the version of sysinfo, not the data version
|
| 185 |
#
|
185 |
#
|
| 186 |
# Version 3.5.5 20200317 RWR
|
186 |
# Version 3.5.5 20200317 RWR
|
| 187 |
# bug fix for bsd/opnsense
|
187 |
# bug fix for bsd/opnsense
|
| 188 |
|
188 |
#
|
| - |
|
189 |
# Version 3.6.0 20220607 RWR
|
| - |
|
190 |
# Changed the way upload works. It automatically now passes an additional parameter, upload_type, which with the new upload
|
| - |
|
191 |
# script will choose a directory, allowing one script to handle various uploads
|
| - |
|
192 |
# additionally, if the key 'postRunScript' is in the config, it is assumed to be the name of a script to be run after sysinfo
|
| - |
|
193 |
# completes it's task. This can be used to download/update the program, add new modules, etc..
|
| - |
|
194 |
|
| - |
|
195 |
|
| 189 |
# find our location and use it for searching for libraries
|
196 |
# find our location and use it for searching for libraries
|
| 190 |
BEGIN {
|
197 |
BEGIN {
|
| 191 |
use FindBin;
|
198 |
use FindBin;
|
| 192 |
use File::Spec;
|
199 |
use File::Spec;
|
| 193 |
use lib File::Spec->catdir($FindBin::Bin);
|
200 |
use lib File::Spec->catdir($FindBin::Bin);
|
| Line 199... |
Line 206... |
| 199 |
my $sourceDir = File::Spec->catdir($FindBin::Bin);
|
206 |
my $sourceDir = File::Spec->catdir($FindBin::Bin);
|
| 200 |
|
207 |
|
| 201 |
# define the version number
|
208 |
# define the version number
|
| 202 |
# see https://metacpan.org/pod/release/JPEACOCK/version-0.97/lib/version.pod
|
209 |
# see https://metacpan.org/pod/release/JPEACOCK/version-0.97/lib/version.pod
|
| 203 |
use version;
|
210 |
use version;
|
| 204 |
our $VERSION = version->declare("v3.5.5");
|
211 |
our $VERSION = version->declare("v3.6.0");
|
| 205 |
our $DATA_VERSION = version->declare( 'v3.0.0' ); # used in sending the data file. sets version of XML/YAML data file
|
212 |
our $DATA_VERSION = version->declare( 'v3.0.0' ); # used in sending the data file. sets version of XML/YAML data file
|
| 206 |
|
213 |
|
| 207 |
# see https://perldoc.perl.org/Getopt/Long.html
|
214 |
# see https://perldoc.perl.org/Getopt/Long.html
|
| 208 |
use Getopt::Long;
|
215 |
use Getopt::Long;
|
| 209 |
# allow -vvn (ie, --verbose --verbose --dryrun)
|
216 |
# allow -vvn (ie, --verbose --verbose --dryrun)
|
| Line 752... |
Line 759... |
| 752 |
|
759 |
|
| 753 |
&logIt( 4, 'At line number ' . __LINE__ . "\n" . Data::Dumper->Dump([$System],[qw($System)]) );
|
760 |
&logIt( 4, 'At line number ' . __LINE__ . "\n" . Data::Dumper->Dump([$System],[qw($System)]) );
|
| 754 |
|
761 |
|
| 755 |
# load some global values for use in the script, if required
|
762 |
# load some global values for use in the script, if required
|
| 756 |
my $globals = {
|
763 |
my $globals = {
|
| - |
|
764 |
'upload_type' => 'sysinfo',
|
| 757 |
'data version' => $DATA_VERSION->normal,
|
765 |
'data version' => $DATA_VERSION->normal,
|
| 758 |
'report date' => $reportDate,
|
766 |
'report date' => $reportDate,
|
| 759 |
'client name' => $configuration{'clientName'},
|
767 |
'client name' => $configuration{'clientName'},
|
| 760 |
'host name' => $configuration{'hostname'},
|
768 |
'host name' => $configuration{'hostname'},
|
| 761 |
'serial number'=> $configuration{'serialNumber'},
|
769 |
'serial number'=> $configuration{'serialNumber'},
|
| Line 776... |
Line 784... |
| 776 |
}
|
784 |
}
|
| 777 |
|
785 |
|
| 778 |
unlink ( $periodicOverrideFile ) if -e $periodicOverrideFile;
|
786 |
unlink ( $periodicOverrideFile ) if -e $periodicOverrideFile;
|
| 779 |
&logIt( 0, 'Ending sysinfo Run' );
|
787 |
&logIt( 0, 'Ending sysinfo Run' );
|
| 780 |
|
788 |
|
| - |
|
789 |
`$configuration{postRunScript}` if $configuration{'postRunScript'};
|
| 781 |
|
790 |
|
| 782 |
1;
|
791 |
1;
|