Changeset 51126 in vbox

Timestamp:

Apr 23, 2014 3:19:32 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93431

Message:

VBoxStub: Added "--reinstall" switch to force re-installation.

File:

• trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp (modified) (5 diffs)

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -820 +820 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
+        /** @todo Replace short parameters with enums since they're not
+         *        used (and not documented to the public). */
         { "--extract",          'x', RTGETOPT_REQ_NOTHING },
         { "-extract",           'x', RTGETOPT_REQ_NOTHING },
@@ -839 +841 @@
         { "--msiparams",        'm', RTGETOPT_REQ_STRING  },
         { "-msiparams",         'm', RTGETOPT_REQ_STRING  },
+        { "--reinstall",        "f", RTGETOPT_REQ_NOTHING },
+        { "-reinstall",         "f", RTGETOPT_REQ_NOTHING },
+        { "/reinstall",         "f", RTGETOPT_REQ_NOTHING },
         { "--version",          'V', RTGETOPT_REQ_NOTHING },
         { "-version",           'V', RTGETOPT_REQ_NOTHING },
@@ -858 +863 @@
         switch (ch)
         {
+            case 'f': /* Force re-installation. */
+                if (szMSIArgs[0])
+                    vrc = RTStrCat(szMSIArgs, sizeof(szMSIArgs), " ");
+                if (RT_SUCCESS(vrc))
+                    vrc = RTStrCat(szMSIArgs, sizeof(szMSIArgs),
+                                   "REINSTALLMODE=vomus REINSTALL=ALL");
+                if (RT_FAILURE(vrc))
+                    return ShowError("MSI parameters are too long.");
+                break;
+
             case 'x':
                 fExtractOnly = true;
@@ -900 +915 @@
                          "\n"
                          "Command Line Parameters:\n\n"
+                         "--help                   - Print this help and exit\n"
                          "--extract                - Extract file contents to temporary directory\n"
-                         "--silent                 - Enables silent mode installation\n"
+                         "--logging                - Enables installer logging\n"
+                         "--msiparams <parameters> - Specifies extra parameters for the MSI installers\n"
                          "--no-silent-cert         - Do not install VirtualBox Certificate automatically when --silent option is specified\n"
                          "--path                   - Sets the path of the extraction directory\n"
-                         "--msiparams <parameters> - Specifies extra parameters for the MSI installers\n"
-                         "--logging                - Enables installer logging\n"
-                         "--help                   - Print this help and exit\n"
+                         "--reinstall              - Forces VirtualBox to get re-installed\n"
+                         "--silent                 - Enables silent mode installation\n"
                          "--version                - Print version number and exit\n\n"
                          "Examples:\n"