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

create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db

This commit is contained in:
Knniggett 2013-10-05 18:38:57 -05:00
parent 5fe50152ff
commit 32ee0a8976
2 changed files with 5 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

@ -429,7 +429,7 @@ if ( $version )
}
else
{
$command .= ZM_PATH_BUILD."/db";
$command .= ZM_PATH_DATA."/db";
}
$command .= "/zm_update-".$version.".sql";
@ -1030,7 +1030,7 @@ if ( $version )
if ( $version ge '1.26.0' ) {
my @files;
$updateDir = ZM_PATH_BUILD."/db" if ! $updateDir;
$updateDir = ZM_PATH_DATA."/db" if ! $updateDir;
opendir( my $dh, $updateDir ) || die "Can't open updateDir $!";
@files = sort grep { (!/^\./) && /^zm_update\-[\d\.]+\.sql$/ && -f "$updateDir/$_" } readdir($dh);
closedir $dh;

3
zm.conf.in
View File

@ -15,6 +15,9 @@ ZM_VERSION=@VERSION@
# Path to build directory, used mostly for finding DB upgrade scripts
ZM_PATH_BUILD=@PATH_BUILD@
# Path to installed data directory, used mostly for finding DB upgrade scripts
ZM_PATH_DATA=@PKGDATADIR@
# Build time, used to record when to trigger various checks
ZM_TIME_BUILD=@TIME_BUILD@