diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-01-05 16:47:12 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-01-05 16:47:12 +0100 |
commit | 0dcf694c8776ac03779e465bdc4859fba9be314d (patch) | |
tree | 25c742f97a98fb7534f8a2180f5b7b165bf7e8c5 /mmc_updater/src/main.cpp | |
parent | a64eebf8eb758971b090b2e87212c2458424797e (diff) | |
download | MultiMC-0dcf694c8776ac03779e465bdc4859fba9be314d.tar MultiMC-0dcf694c8776ac03779e465bdc4859fba9be314d.tar.gz MultiMC-0dcf694c8776ac03779e465bdc4859fba9be314d.tar.lz MultiMC-0dcf694c8776ac03779e465bdc4859fba9be314d.tar.xz MultiMC-0dcf694c8776ac03779e465bdc4859fba9be314d.zip |
More updater fixage
Preserve --dir parameter after updating
Allow more than one copy of a command line parameter in MultiMC
Linux runner script no longer changes current directory, which allows '--dir .'
Fixed unit tests, removed the obsolete one (for some legacy updater command line params that were also removed)
[fixes 63127704]
Diffstat (limited to 'mmc_updater/src/main.cpp')
-rw-r--r-- | mmc_updater/src/main.cpp | 4 |
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) |