From a2a28d389e2d1a7bb3f067bc0bf8b53bfbed984b Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 9 Jun 2020 13:35:52 -0400 Subject: [PATCH] Finish exporting and fixing new systemStatus packageControl and daemonControl functions --- scripts/ZoneMinder/lib/ZoneMinder/General.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/General.pm b/scripts/ZoneMinder/lib/ZoneMinder/General.pm index 6437ebbdf..cd6463add 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/General.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/General.pm @@ -28,7 +28,9 @@ our %EXPORT_TAGS = ( makePath jsonEncode jsonDecode - status + systemStatus + packageControl + daemonControl ) ] ); push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS; @@ -553,7 +555,7 @@ sub daemonControl { } sub systemStatus { - my $command = shift; + my $command = $Config{ZM_PATH_BIN}.'/zmdc.pl check'; my $output = qx($command); my $status = $? >> 8; if ( $status || logDebugging() ) { @@ -575,7 +577,6 @@ ZoneMinder::General - Utility Functions for ZoneMinder =head1 SYNOPSIS use ZoneMinder::General; -blah blah blah =head1 DESCRIPTION @@ -594,6 +595,9 @@ of the ZoneMinder scripts makePath jsonEncode jsonDecode + packageControl + daemonControl + systemStatus ) ]