mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-24 07:18:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into storageareas

Browse Source
This commit is contained in:
Isaac Connor committed 2016-08-08 18:09:11 -04:00
2 parents 2451768295 fbc0086fcc
commit 3d65b0d2ad
1 file changed
+4 -10
Download Patch File Download Diff File Expand all files Collapse all files
scripts/zmupdate.pl.in
+4 -10
View File
@@ -412,15 +412,12 @@ if ( $version )
{
my ( $host, $port ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
my $command = "mysqldump";
$command .= " -h".$host if defined($host);
$command .= " -h".$host if defined($host);
$command .= " -P".$port if defined($port);
if ( $dbUser )
{
$command .= " -u".$dbUser;
if ( $dbPass )
{
$command .= " -p".$dbPass;
}
$command .= ' -u'.$dbUser;
$command .= ' -p"'.$dbPass.'"' if $dbPass;
}
my $backup = "@ZM_TMPDIR@/".$Config{ZM_DB_NAME}."-".$version.".dump";
$command .= " --add-drop-table --databases ".$Config{ZM_DB_NAME}." > ".$backup;
@@ -458,10 +455,7 @@ if ( $version )
if ( $dbUser )
{
$command .= " -u".$dbUser;
if ( $dbPass )
{
$command .= ' -p"'.$dbPass.'"';
}
$command .= ' -p"'.$dbPass.'"' if $dbPass;
}
$command .= " ".$Config{ZM_DB_NAME}." < ";
if ( $updateDir )