summaryrefslogtreecommitdiffstats
path: root/mmc_updater/src/main.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-12-07 03:57:40 +0100
committerPetr Mrázek <peterix@gmail.com>2013-12-07 03:57:40 +0100
commit220e07aef4a34dca9f31ae0c5bb994e5c594125d (patch)
tree70821c6dbe7e6c2f66f231dcb1bad62a763638d7 /mmc_updater/src/main.cpp
parent858916b951e92127c22503826b746d1e70c433f6 (diff)
parent7a6705030c36b2d6b94da1acd5bdf2311e4efeb7 (diff)
downloadMultiMC-220e07aef4a34dca9f31ae0c5bb994e5c594125d.tar
MultiMC-220e07aef4a34dca9f31ae0c5bb994e5c594125d.tar.gz
MultiMC-220e07aef4a34dca9f31ae0c5bb994e5c594125d.tar.lz
MultiMC-220e07aef4a34dca9f31ae0c5bb994e5c594125d.tar.xz
MultiMC-220e07aef4a34dca9f31ae0c5bb994e5c594125d.zip
Merge branch 'feature_updater' of github.com:MultiMC/MultiMC5 into feature_updater
Diffstat (limited to 'mmc_updater/src/main.cpp')
-rw-r--r--mmc_updater/src/main.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/mmc_updater/src/main.cpp b/mmc_updater/src/main.cpp
index e23cf16d..fb072ab5 100644
--- a/mmc_updater/src/main.cpp
+++ b/mmc_updater/src/main.cpp
@@ -137,7 +137,8 @@ int main(int argc, char** argv)
+ ", package-dir: " + options.packageDir
+ ", wait-pid: " + intToStr(options.waitPid)
+ ", script-path: " + options.scriptPath
- + ", mode: " + intToStr(options.mode));
+ + ", mode: " + intToStr(options.mode)
+ + ", finish-cmd: " + options.finishCmd);
installer.setMode(options.mode);
installer.setInstallDir(options.installDir);
@@ -146,6 +147,7 @@ int main(int argc, char** argv)
installer.setWaitPid(options.waitPid);
installer.setForceElevated(options.forceElevated);
installer.setAutoClose(options.autoClose);
+ installer.setFinishCmd(options.finishCmd);
if (options.mode == UpdateInstaller::Main)
{