Bug 312 - Added /usr/local/bin to paths for mysql. Added 1.22.1 update.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1963 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
parent
f803481079
commit
fcb27ace30
|
@ -56,7 +56,7 @@ use constant EVENT_PATH => ZM_PATH_WEB.'/'.ZM_DIR_EVENTS;
|
||||||
|
|
||||||
$| = 1;
|
$| = 1;
|
||||||
|
|
||||||
$ENV{PATH} = '/bin:/usr/bin';
|
$ENV{PATH} = '/bin:/usr/bin:/usr/local/bin';
|
||||||
$ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
|
$ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
|
||||||
delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
|
delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
|
||||||
|
|
||||||
|
@ -615,6 +615,12 @@ if ( $version )
|
||||||
}
|
}
|
||||||
$cascade = !undef;
|
$cascade = !undef;
|
||||||
}
|
}
|
||||||
|
if ( $cascade || $version eq "1.22.1" )
|
||||||
|
{
|
||||||
|
# Patch the database
|
||||||
|
patchDB( $dbh, "1.22.1" );
|
||||||
|
$cascade = !undef;
|
||||||
|
}
|
||||||
if ( $cascade )
|
if ( $cascade )
|
||||||
{
|
{
|
||||||
my $installed_version = ZM_VERSION;
|
my $installed_version = ZM_VERSION;
|
||||||
|
|
Loading…
Reference in New Issue