summaryrefslogtreecommitdiffstats
path: root/logic/updater/DownloadUpdateTask.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-12-28 02:03:53 +0100
committerPetr Mrázek <peterix@gmail.com>2013-12-28 04:23:48 +0100
commit7652b3d64a63c587f520633364412345083210d4 (patch)
tree12d98c301aa931f20aee0875242bc762cf4d22d1 /logic/updater/DownloadUpdateTask.h
parent30d4f5981d3220386bd320534048594fc364d0e9 (diff)
downloadMultiMC-7652b3d64a63c587f520633364412345083210d4.tar
MultiMC-7652b3d64a63c587f520633364412345083210d4.tar.gz
MultiMC-7652b3d64a63c587f520633364412345083210d4.tar.lz
MultiMC-7652b3d64a63c587f520633364412345083210d4.tar.xz
MultiMC-7652b3d64a63c587f520633364412345083210d4.zip
Various updater fixes
Updater tests for path utils The updater now doesn't use splitpath on Windows (fixes problems with Windows XP) Fix up paths for the OSX updater - should now install the updates into the right place Fix translations install path - translation isntall and deploy should be fixed
Diffstat (limited to 'logic/updater/DownloadUpdateTask.h')
-rw-r--r--logic/updater/DownloadUpdateTask.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/logic/updater/DownloadUpdateTask.h b/logic/updater/DownloadUpdateTask.h
index 79d73af3..d82b044f 100644
--- a/logic/updater/DownloadUpdateTask.h
+++ b/logic/updater/DownloadUpdateTask.h
@@ -198,7 +198,21 @@ protected:
* Filters paths
* Path of the format $PWD/path, it is converted to a file:///$PWD/ URL
*/
- static QString preparePath(const QString &path);
+ static QString fixPathForTests(const QString &path);
+
+ /*!
+ * Filters paths
+ * This fixes destination paths for OSX.
+ * 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 ../..
+ *
+ * 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);
protected slots:
void vinfoDownloadFinished();