Merge branch 'feature_updater' of github.com:MultiMC/MultiMC5 into feature_updater

This commit is contained in:
Petr Mrázek
2013-12-07 03:57:40 +01:00
18 changed files with 263 additions and 83 deletions

View File

@@ -104,6 +104,7 @@ void UpdaterOptions::parse(int argc, char** argv)
AnyOption parser;
parser.setOption("install-dir");
parser.setOption("package-dir");
parser.setOption("finish-cmd");
parser.setOption("script");
parser.setOption("wait");
parser.setOption("mode");
@@ -133,6 +134,10 @@ void UpdaterOptions::parse(int argc, char** argv)
{
waitPid = static_cast<PLATFORM_PID>(atoll(parser.getValue("wait")));
}
if (parser.getValue("finish-cmd"))
{
finishCmd = parser.getValue("finish-cmd");
}
showVersion = parser.getFlag("version");
forceElevated = parser.getFlag("force-elevated");