summaryrefslogtreecommitdiffstats
path: root/mmc_updater/src/main.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-05 16:54:03 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-05 16:54:03 +0100
commit6bf5c362ba0fa641440fabb78dbbaf4f7656a253 (patch)
tree820934546683b334568af418286985bab6e65e4f /mmc_updater/src/main.cpp
parentced640f68c25c1ea40f86be5af736aa0263dd3ee (diff)
parent0dcf694c8776ac03779e465bdc4859fba9be314d (diff)
downloadMultiMC-6bf5c362ba0fa641440fabb78dbbaf4f7656a253.tar
MultiMC-6bf5c362ba0fa641440fabb78dbbaf4f7656a253.tar.gz
MultiMC-6bf5c362ba0fa641440fabb78dbbaf4f7656a253.tar.lz
MultiMC-6bf5c362ba0fa641440fabb78dbbaf4f7656a253.tar.xz
MultiMC-6bf5c362ba0fa641440fabb78dbbaf4f7656a253.zip
Merge branch 'updater-tweak' into develop
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 f6b31a32..602c30a6 100644
--- a/mmc_updater/src/main.cpp
+++ b/mmc_updater/src/main.cpp
@@ -138,7 +138,8 @@ int main(int argc, char** argv)
+ ", wait-pid: " + intToStr(options.waitPid)
+ ", script-path: " + options.scriptPath
+ ", mode: " + intToStr(options.mode)
- + ", finish-cmd: " + options.finishCmd);
+ + ", finish-cmd: " + options.finishCmd
+ + ", finish-dir: " + options.finishDir);
installer.setMode(options.mode);
installer.setInstallDir(options.installDir);
@@ -148,6 +149,7 @@ int main(int argc, char** argv)
installer.setForceElevated(options.forceElevated);
installer.setAutoClose(options.autoClose);
installer.setFinishCmd(options.finishCmd);
+ installer.setFinishDir(options.finishDir);
installer.setDryRun(options.dryRun);
if (options.mode == UpdateInstaller::Main)