change command line switch to --run-diagnostics

rstudio · Sep 27, 2012 · 2bd634e · 2bd634e
1 parent f99b7f5
commit 2bd634e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/package/win32/cmake/modules/NSIS.template.in b/package/win32/cmake/modules/NSIS.template.in
@@ -730,7 +730,7 @@ Section "-Core installation"
   ;
   CreateShortCut "$INSTDIR\bin\Run Diagnostics.lnk" \
                  "$WINDIR\system32\cmd.exe" \
-                 "/K $\"$INSTDIR\bin\rstudio.exe$\" --verify-installation" \
+                 "/K $\"$INSTDIR\bin\rstudio.exe$\" --run-diagnostics" \
                  "$WINDIR\system32\cmd.exe" 0 \
                  SW_SHOWNORMAL
 

diff --git a/src/cpp/desktop/DesktopMain.cpp b/src/cpp/desktop/DesktopMain.cpp
@@ -228,7 +228,7 @@ int main(int argc, char* argv[])
          if (pApp->arguments().size() > 1)
          {
             QString arg = pApp->arguments().last();
-            if (arg != QString::fromAscii(kVerifyInstallationOption))
+            if (arg != QString::fromAscii(kRunDiagnosticsOption))
                filename = verifyAndNormalizeFilename(arg);
          }
       }
@@ -249,8 +249,8 @@ int main(int argc, char* argv[])
       // init options from command line
       desktop::options().initFromCommandLine(pApp->arguments());
 
-      // reset log if we are in verify-installation mode
-      if (desktop::options().verifyInstallation())
+      // reset log if we are in run-diagnostics mode
+      if (desktop::options().runDiagnostics())
       {
          desktop::reattachConsoleIfNecessary();
          initializeStderrLog("rdesktop", core::system::kLogLevelWarning);

diff --git a/src/cpp/desktop/DesktopOptions.cpp b/src/cpp/desktop/DesktopOptions.cpp
@@ -43,8 +43,8 @@ void Options::initFromCommandLine(const QStringList& arguments)
    for (int i=1; i<arguments.size(); i++)
    {
       QString arg = arguments.at(i);
-      if (arg == QString::fromAscii(kVerifyInstallationOption))
-         verifyInstallation_ = true;
+      if (arg == QString::fromAscii(kRunDiagnosticsOption))
+         runDiagnostics_ = true;
    }
 }
 

diff --git a/src/cpp/desktop/DesktopOptions.hpp b/src/cpp/desktop/DesktopOptions.hpp
@@ -23,7 +23,7 @@
 
 #include <core/FilePath.hpp>
 
-#define kVerifyInstallationOption "--verify-installation"
+#define kRunDiagnosticsOption "--run-diagnostics"
 
 #if defined(__APPLE__)
 #define FORMAT QSettings::NativeFormat
@@ -83,13 +83,13 @@ class Options : boost::noncopyable
 
    bool webkitDevTools();
 
-   bool verifyInstallation() { return verifyInstallation_; }
+   bool runDiagnostics() { return runDiagnostics_; }
 
 private:
    Options() : settings_(FORMAT, QSettings::UserScope,
                          QString::fromAscii("RStudio"),
                          QString::fromAscii("desktop")),
-               verifyInstallation_(false)
+               runDiagnostics_(false)
    {
    }
    friend Options& options();
@@ -99,7 +99,7 @@ class Options : boost::noncopyable
    mutable core::FilePath executablePath_;
    mutable core::FilePath supportingFilePath_;
    mutable QString portNumber_;
-   bool verifyInstallation_;
+   bool runDiagnostics_;
 };
 
 } // namespace desktop

diff --git a/src/cpp/desktop/DesktopSessionLauncher.cpp b/src/cpp/desktop/DesktopSessionLauncher.cpp
@@ -30,7 +30,7 @@
 #include "DesktopSlotBinders.hpp"
 #include "DesktopGwtCallback.hpp"
 
-#define VERIFY_INSTALLATION_LOG(message) if (desktop::options().verifyInstallation()) \
+#define RUN_DIAGNOSTICS_LOG(message) if (desktop::options().runDiagnostics()) \
              std::cout << (message) << std::endl;
 
 using namespace core;
@@ -44,7 +44,7 @@ void launchProcess(std::string absPath,
                    QProcess** ppProc)
 {
    QProcess* pProcess = new QProcess();
-   if (options().verifyInstallation())
+   if (options().runDiagnostics())
       pProcess->setProcessChannelMode(QProcess::ForwardedChannels);
    else
       pProcess->setProcessChannelMode(QProcess::SeparateChannels);
@@ -70,7 +70,7 @@ void logEnvVar(const std::string& name)
 {
    std::string value = core::system::getenv(name);
    if (!value.empty())
-      VERIFY_INSTALLATION_LOG("  " + name + "=" + value);
+      RUN_DIAGNOSTICS_LOG("  " + name + "=" + value);
 }
 
 } // anonymous namespace
@@ -88,7 +88,7 @@ Error SessionLauncher::launchFirstSession(const QString& filename,
    QUrl url;
    buildLaunchContext(&host, &port, &argList, &url);
 
-   VERIFY_INSTALLATION_LOG("\nAttempting to launch R session...");
+   RUN_DIAGNOSTICS_LOG("\nAttempting to launch R session...");
    logEnvVar("RSTUDIO_WHICH_R");
    logEnvVar("R_HOME");
    logEnvVar("R_DOC_DIR");
@@ -107,7 +107,7 @@ Error SessionLauncher::launchFirstSession(const QString& filename,
    if (error)
      return error;
 
-   VERIFY_INSTALLATION_LOG("\nR session launched, "
+   RUN_DIAGNOSTICS_LOG("\nR session launched, "
                            "attempting to connect on port "
                            + port.toStdString() +
                            "...");
@@ -131,7 +131,7 @@ Error SessionLauncher::launchFirstSession(const QString& filename,
    if (error)
       return error;
 
-   VERIFY_INSTALLATION_LOG("\nConnected to R session, attempting to initialize...\n");
+   RUN_DIAGNOSTICS_LOG("\nConnected to R session, attempting to initialize...\n");
 
    // one-time workbench intiailized hook for startup file association
    if (!filename.isNull() && !filename.isEmpty())
@@ -157,8 +157,8 @@ Error SessionLauncher::launchFirstSession(const QString& filename,
                          this, SLOT(onRSessionExited(int,QProcess::ExitStatus)));
 
 
-   // show the window (but don't if we are doing a --verify-installation)
-   if (!options().verifyInstallation())
+   // show the window (but don't if we are doing a --run-diagnostics)
+   if (!options().runDiagnostics())
    {
       pMainWindow_->show();
       pAppLaunch->activateWindow();
@@ -183,7 +183,7 @@ void SessionLauncher::closeAllSatillites()
 void SessionLauncher::onRSessionExited(int, QProcess::ExitStatus)
 {
    // if this is a verify-installation session then just quit
-   if (options().verifyInstallation())
+   if (options().runDiagnostics())
    {
       pMainWindow_->quit();
       return;
@@ -400,7 +400,7 @@ void SessionLauncher::buildLaunchContext(QString* pHost,
 
    *pArgList << QString::fromAscii("--www-port") << *pPort;
 
-   if (options().verifyInstallation())
+   if (options().runDiagnostics())
       *pArgList << QString::fromAscii("--verify-installation") <<
                    QString::fromAscii("1");
 }