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

default interactive to whether we have stdio. So now when running from console it will default to interactive and when running from zmdc.pl will be non-interactive. Do check regardless of ZM_UPDATE_CHECK setting.

This commit is contained in:
Isaac Connor 2022-01-13 10:21:32 -05:00
parent 58bd09d83d
commit 162e12bf92
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/zmupdate.pl.in
View File

@ -96,7 +96,7 @@ my $use_log = (($> == 0) || ($> == $web_uid));
logInit( toFile=>$use_log?DEBUG:NOLOG ); logInit( toFile=>$use_log?DEBUG:NOLOG );
logSetSignal(); logSetSignal();
my $interactive = 1; my $interactive = -t STDERR; # interactive if we have IO
my $check = 0; my $check = 0;
my $freshen = 0; my $freshen = 0;
my $rename = 0; my $rename = 0;
@ -144,7 +144,7 @@ if ( ($check + $freshen + $rename + $zoneFix + $migrateEvents + ($version?1:0))
pod2usage(-exitstatus => -1); pod2usage(-exitstatus => -1);
} }
if ($check and ($Config{ZM_CHECK_FOR_UPDATES} or $interactive) ) { if ($check) {
if (!$interactive) { if (!$interactive) {
Info('Update agent starting at '.strftime('%y/%m/%d %H:%M:%S', localtime() )."\n"); Info('Update agent starting at '.strftime('%y/%m/%d %H:%M:%S', localtime() )."\n");
} }