mac agent

package.json

@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "0.100.9",
+  "version": "0.100.10-dev",
   "private": true,
   "productName": "Tactical RMM",
   "scripts": {

src/components/AgentTable.vue

@@ -196,6 +196,14 @@
             >
               <q-tooltip>Linux</q-tooltip>
             </q-icon>
+            <q-icon
+              v-else-if="props.row.plat === 'darwin'"
+              name="mdi-apple"
+              size="sm"
+              color="primary"
+            >
+              <q-tooltip>macOS</q-tooltip>
+            </q-icon>
           </q-td>
 
           <q-td key="checks-status" :props="props">

src/components/modals/agents/AgentDownload.vue

@@ -37,7 +37,7 @@
           </q-badge>
           <span>Do not popup any message boxes during install</span>
         </div>
-        <div class="q-pa-xs q-gutter-xs">
+        <div v-if="info.plat === 'windows'" class="q-pa-xs q-gutter-xs">
           <q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
             <code
               >-local-mesh "C:\\&lt;some folder or
@@ -46,7 +46,7 @@
           </q-badge>
           <span> To skip downloading the Mesh Agent during the install.</span>
         </div>
-        <div class="q-pa-xs q-gutter-xs">
+        <div v-if="info.plat === 'windows'" class="q-pa-xs q-gutter-xs">
           <q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
             <code
               >-meshdir "C:\Program Files\Your Company Name\Mesh Agent"</code
@@ -63,7 +63,7 @@
           </q-badge>
           <span>Don't install the mesh agent</span>
         </div>
-        <div class="q-pa-xs q-gutter-xs">
+        <div v-if="info.plat === 'windows'" class="q-pa-xs q-gutter-xs">
           <q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
             <code>-cert "C:\\&lt;some folder or path&gt;\\ca.pem"</code>
           </q-badge>

src/components/modals/agents/BulkAction.vue

@@ -223,6 +223,7 @@ const monTypeOptions = [
 const osTypeOptions = [
   { label: "Windows", value: "windows" },
   { label: "Linux", value: "linux" },
+  { label: "macOS", value: "darwin" },
   { label: "All", value: "all" },
 ];
 

src/components/modals/agents/InstallAgent.vue

@@ -52,6 +52,15 @@
                 goarch = GOARCH_AMD64;
               "
             />
+            <q-radio
+              v-model="agentOS"
+              val="darwin"
+              label="macOS"
+              @update:model-value="
+                installMethod = 'mac';
+                goarch = GOARCH_AMD64;
+              "
+            />
           </div>
         </q-card-section>
         <q-card-section>
@@ -105,37 +114,37 @@
               v-model="goarch"
               :val="GOARCH_AMD64"
               label="64 bit"
-              v-show="agentOS === 'windows'"
-            />
-            <q-radio
-              v-model="goarch"
-              :val="GOARCH_i386"
-              label="32 bit"
-              v-show="agentOS === 'windows'"
+              v-show="agentOS === 'windows' || agentOS === 'linux'"
             />
             <q-radio
               v-model="goarch"
               :val="GOARCH_AMD64"
-              label="64 bit"
-              v-show="agentOS !== 'windows'"
+              label="Intel 64 bit"
+              v-show="agentOS === 'darwin'"
             />
             <q-radio
               v-model="goarch"
               :val="GOARCH_i386"
               label="32 bit"
-              v-show="agentOS !== 'windows'"
+              v-show="agentOS !== 'darwin'"
             />
             <q-radio
               v-model="goarch"
               :val="GOARCH_ARM64"
               label="ARM 64 bit"
-              v-show="agentOS !== 'windows'"
+              v-show="agentOS === 'linux'"
+            />
+            <q-radio
+              v-model="goarch"
+              :val="GOARCH_ARM64"
+              label="Apple Silicon (M1, M2)"
+              v-show="agentOS === 'darwin'"
             />
             <q-radio
               v-model="goarch"
               :val="GOARCH_ARM32"
               label="ARM 32 bit (Rasp Pi)"
-              v-show="agentOS !== 'windows'"
+              v-show="agentOS === 'linux'"
             />
           </div>
         </q-card-section>
@@ -266,12 +275,13 @@ export default {
         plat: this.agentOS,
       };
 
-      if (this.installMethod === "manual") {
+      if (this.installMethod === "manual" || this.installMethod === "mac") {
         this.$axios.post("/agents/installer/", data).then((r) => {
           this.info = {
             expires: this.expires,
             data: r.data,
             goarch: this.goarch,
+            plat: this.agentOS,
           };
           this.showAgentDownload = true;
         });
@@ -343,6 +353,9 @@ export default {
         case "bash":
           text = "Download linux install script";
           break;
+        case "mac":
+          text = "Show installation instructions";
+          break;
       }
 
       return text;

src/composables/agents.js

@@ -37,4 +37,5 @@ export function cmdPlaceholder(shell) {
 export const agentPlatformOptions = [
   { value: "windows", label: "Windows" },
   { value: "linux", label: "Linux" },
+  { value: "darwin", label: "macOS" },
 ];