aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

file filenames so window updater works (#2500)

Browse source 
* file filenames so window updater works
This commit is contained in:
Zach H 2017-03-18 18:48:40 -04:00 committed by GitHub
parent fb194db766
commit 3b2eff2551
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cockatrice/src/releasechannel.cpp
View file

@ -55,10 +55,14 @@ bool ReleaseChannel::downloadMatchesCurrentOS(QVariantMap build)
{
QString wordSize = QSysInfo::buildAbi().split('-')[2];
QString arch;
QString devSnapshotEnd;
if (wordSize == "llp64") {
arch = "win64";
devSnapshotEnd = "-x86_64_qt5";
} else if (wordSize == "ilp32") {
arch = "win32";
devSnapshotEnd = "-x86_qt5";
} else {
qWarning() << "Error checking for upgrade version: wordSize is" << wordSize;
return false;
@ -68,7 +72,10 @@ bool ReleaseChannel::downloadMatchesCurrentOS(QVariantMap build)
// Checking for .zip is a workaround for the May 6th 2016 release
auto zipName = arch + ".zip";
auto exeName = arch + ".exe";
return fileName.endsWith(exeName) || fileName.endsWith(zipName);
auto zipDebugName = devSnapshotEnd + ".zip";
auto exeDebugName = devSnapshotEnd + ".exe";
return (fileName.endsWith(exeName) || fileName.endsWith(zipName) ||
fileName.endsWith(exeDebugName) || fileName.endsWith(zipDebugName));
}
#else