diff options
author | Petr Mrázek <peterix@gmail.com> | 2019-09-19 01:13:02 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2019-09-19 01:13:02 +0200 |
commit | a35a2e877e717087cc93257199059f6a03667e4a (patch) | |
tree | c631c7df2a0a4024543ca6d137e0de121ae6d7b0 /api/logic/updater/GoUpdate.cpp | |
parent | 4e93c4d012f0f5ae18ea0314c9fe26ba4710f8b1 (diff) | |
download | PrismLauncher-a35a2e877e717087cc93257199059f6a03667e4a.tar.gz PrismLauncher-a35a2e877e717087cc93257199059f6a03667e4a.tar.bz2 PrismLauncher-a35a2e877e717087cc93257199059f6a03667e4a.zip |
NOISSUE remove nonsensical logic related to 'MultiMC.app/' prefixes in update manifests
Diffstat (limited to 'api/logic/updater/GoUpdate.cpp')
-rw-r--r-- | api/logic/updater/GoUpdate.cpp | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/api/logic/updater/GoUpdate.cpp b/api/logic/updater/GoUpdate.cpp index ef040db6..6167418e 100644 --- a/api/logic/updater/GoUpdate.cpp +++ b/api/logic/updater/GoUpdate.cpp @@ -33,13 +33,7 @@ bool parseVersionInfo(const QByteArray &data, VersionFileList &list, QString &er QJsonObject fileObj = fileValue.toObject(); QString file_path = fileObj.value("Path").toString(); -#ifdef Q_OS_MAC - // On OSX, the paths for the updater need to be fixed. - // basically, anything that isn't in the .app folder is ignored. - // everything else is changed so the code that processes the files actually finds - // them and puts the replacements in the right spots. - fixPathForOSX(file_path); -#endif + VersionFileEntry file{file_path, fileObj.value("Perms").toVariant().toInt(), FileSourceList(), fileObj.value("MD5").toString(), }; qDebug() << "File" << file.path << "with perms" << file.mode; @@ -201,19 +195,4 @@ bool processFileLists } return true; } - -bool fixPathForOSX(QString &path) -{ - if (path.startsWith("MultiMC.app/")) - { - // remove the prefix and add a new, more appropriate one. - path.remove(0, 12); - return true; - } - else - { - qCritical() << "Update path not within .app: " << path; - return false; - } } -}
\ No newline at end of file |