Changeset 85524 in vbox for trunk

Timestamp:

Jul 29, 2020 12:58:57 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9722: VirtualBox Manager: One possible way to execute cloud console connection command by opening it via Open command.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -78 +78 @@
 #include "CUnattended.h"
 #include "CVirtualBoxErrorInfo.h"
+#ifdef VBOX_WS_MAC
+# include "CVirtualBox.h"
+#endif
 
 /* Other VBox stuff: */
@@ -1275 +1278 @@
     const CCloudMachine comMachine = pCloudItem->machine();
 
-#ifdef VBOX_WS_WIN
+#if defined(VBOX_WS_WIN)
     /* Gather arguments: */
     QStringList arguments;
@@ -1283 +1286 @@
     /* Execute console application finally: */
     QProcess::startDetached(QString("%1 %2").arg(strPath, arguments.join(' ')));
-#else /* !VBOX_WS_WIN */
+#elif defined(VBOX_WS_MAC)
+    /* Gather arguments: */
+    QStringList arguments;
+    arguments << parseShellArguments(strArguments);
+
+    /* Make sure that isn't a request to start Open command: */
+    if (strPath != "open" && strPath != "/usr/bin/open")
+    {
+        /* In that case just add the command we have as simple argument: */
+        arguments << comMachine.GetSerialConsoleCommand();
+    }
+    else
+    {
+        /* Otherwise upload command to external file which can be opened with Open command: */
+        QDir uiHomeFolder(uiCommon().virtualBox().GetHomeFolder());
+        const QString strAbsoluteCommandName = uiHomeFolder.absoluteFilePath("last.command");
+        QFile file(strAbsoluteCommandName);
+        file.setPermissions(QFileDevice::ReadOwner | QFileDevice::WriteOwner | QFileDevice::ExeOwner);
+        if (!file.open(QIODevice::WriteOnly))
+            AssertFailedReturnVoid();
+        file.write(comMachine.GetSerialConsoleCommand().toUtf8());
+        file.close();
+        arguments << strAbsoluteCommandName;
+    }
+
+    /* Execute console application finally: */
+    QProcess::startDetached(strPath, arguments);
+#else /* !VBOX_WS_WIN && !VBOX_WS_MAC */
     /* Gather arguments: */
     QStringList arguments;
@@ -1291 +1321 @@
     /* Execute console application finally: */
     QProcess::startDetached(strPath, arguments);
-#endif /* !VBOX_WS_WIN */
+#endif /* !VBOX_WS_WIN && !VBOX_WS_MAC */
 }