Mess with the updater again.

This commit is contained in:
Petr Mrázek
2014-01-05 00:06:55 +01:00
parent e558584af0
commit b49fa9d2a9
12 changed files with 119 additions and 161 deletions

View File

@ -402,12 +402,17 @@ DownloadUpdateTask::processFileLists(NetJob *job,
if (isUpdater)
{
#ifdef MultiMC_UPDATER_DRY_RUN
QLOG_DEBUG() << "Skipping updater download and using local version.";
#else
auto cache_entry = MMC->metacache()->resolveEntry("root", entry.path);
QLOG_DEBUG() << "Updater will be in " << cache_entry->getFullPath();
// force check.
cache_entry->stale = true;
auto download = CacheDownload::make(QUrl(source.url), cache_entry);
job->addNetAction(download);
#endif
}
else
{
@ -514,7 +519,6 @@ bool DownloadUpdateTask::fixPathForOSX(QString &path)
{
// remove the prefix and add a new, more appropriate one.
path.remove(0, 12);
path = QString("../../") + path;
return true;
}
else

View File

@ -206,11 +206,9 @@ protected:
* The updater runs in MultiMC.app/Contents/MacOs by default
* The destination paths are such as this: MultiMC.app/blah/blah
*
* Therefore we chop off the 'MultiMC.app' prefix and prepend ../..
* Therefore we chop off the 'MultiMC.app' prefix
*
* Returns false if the path couldn't be fixed (is invalid)
*
* Has no effect on systems that aren't OSX
*/
static bool fixPathForOSX(QString &path);

View File

@ -17,7 +17,6 @@
#include "MultiMC.h"
#include "config.h"
#include "logger/QsLog.h"
#include <QJsonObject>