From 6f760f5d4fce2540977c50e11f4ea90996edcbaa Mon Sep 17 00:00:00 2001
From: wh1te909 <dcparsi@gmail.com>
Date: Thu, 10 Mar 2022 00:57:55 +0000
Subject: [PATCH] v0.12.0

---
 package-lock.json                             |  14 +--
 package.json                                  |   2 +-
 src/api/agents.js                             |   4 +-
 src/api/core.js                               |   5 -
 src/components/AgentTable.vue                 |  26 +++--
 src/components/agents/AgentActionMenu.vue     |   4 +-
 src/components/agents/AssetsTab.vue           |   5 +
 src/components/agents/AutomatedTasksTab.vue   |   5 +
 src/components/agents/ChecksTab.vue           |  12 ++-
 src/components/agents/SoftwareTab.vue         |   5 +
 src/components/agents/WinUpdateTab.vue        |   5 +
 .../agents/remotebg/EventLogManager.vue       |  10 +-
 .../agents/remotebg/ServicesManager.vue       |  10 +-
 src/components/core/UploadMesh.vue            |  98 -----------------
 src/components/logs/PendingActions.vue        |   3 -
 .../modals/agents/AgentDownload.vue           |  22 +---
 .../modals/agents/AgentRecovery.vue           |   9 +-
 src/components/modals/agents/BulkAction.vue   | 100 +++++++++++++++---
 src/components/modals/agents/InstallAgent.vue |  65 +++++++++---
 src/components/modals/agents/RunScript.vue    |  23 +++-
 src/components/modals/agents/SendCommand.vue  |  34 ++++--
 .../modals/coresettings/EditCoreSettings.vue  |  10 +-
 src/components/scripts/ScriptFormModal.vue    |  29 ++++-
 src/components/scripts/ScriptManager.vue      |   6 ++
 .../scripts/ScriptSnippetFormModal.vue        |  13 ++-
 src/components/scripts/ScriptSnippets.vue     |   3 +
 src/components/scripts/ScriptUploadModal.vue  |   4 +-
 src/composables/agents.js                     |   6 ++
 src/composables/scripts.js                    |   9 +-
 src/store/index.js                            |   4 +
 src/utils/format.js                           |  67 ++++++------
 src/views/Dashboard.vue                       |   8 ++
 src/views/InitialSetup.vue                    |  37 +------
 src/views/RemoteBackground.vue                |  17 +--
 34 files changed, 386 insertions(+), 288 deletions(-)
 delete mode 100644 src/components/core/UploadMesh.vue

diff --git a/package-lock.json b/package-lock.json
index 96cdfb2..524f9f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.8",
       "dependencies": {
         "@quasar/extras": "^1.12.5",
-        "apexcharts": "^3.33.1",
+        "apexcharts": "^3.33.2",
         "axios": "^0.26.0",
         "dotenv": "^16.0.0",
         "qrcode.vue": "^3.3.3",
@@ -3077,9 +3077,9 @@
       }
     },
     "node_modules/apexcharts": {
-      "version": "3.33.1",
-      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.33.1.tgz",
-      "integrity": "sha512-5aVzrgJefd8EH4w7oRmuOhA3+cxJxQg27cYg3ANVGvPCOB4AY3mVVNtFHRFaIq7bv8ws4GRaA9MWfzoWQw3MPQ==",
+      "version": "3.33.2",
+      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.33.2.tgz",
+      "integrity": "sha512-GkHZ3o36ZT/jSBh5y1pxxRzwM3tvtladtkcUTfXwP0wYAHK8Qj0X4ZPsupP7emRIjhOVpGsCxW9xeO3F5w+AOQ==",
       "dependencies": {
         "svg.draggable.js": "^2.2.2",
         "svg.easing.js": "^2.0.0",
@@ -15286,9 +15286,9 @@
       }
     },
     "apexcharts": {
-      "version": "3.33.1",
-      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.33.1.tgz",
-      "integrity": "sha512-5aVzrgJefd8EH4w7oRmuOhA3+cxJxQg27cYg3ANVGvPCOB4AY3mVVNtFHRFaIq7bv8ws4GRaA9MWfzoWQw3MPQ==",
+      "version": "3.33.2",
+      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.33.2.tgz",
+      "integrity": "sha512-GkHZ3o36ZT/jSBh5y1pxxRzwM3tvtladtkcUTfXwP0wYAHK8Qj0X4ZPsupP7emRIjhOVpGsCxW9xeO3F5w+AOQ==",
       "requires": {
         "svg.draggable.js": "^2.2.2",
         "svg.easing.js": "^2.0.0",
diff --git a/package.json b/package.json
index 83df414..79d1b6a 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@quasar/extras": "^1.12.5",
-    "apexcharts": "^3.33.1",
+    "apexcharts": "^3.33.2",
     "axios": "^0.26.0",
     "dotenv": "^16.0.0",
     "qrcode.vue": "^3.3.3",
diff --git a/src/api/agents.js b/src/api/agents.js
index 390dbe5..bf0ab2c 100644
--- a/src/api/agents.js
+++ b/src/api/agents.js
@@ -14,8 +14,8 @@ export function openAgentWindow(agent_id) {
   openURL(url, null, { popup: true, scrollbars: false, location: false, status: false, toolbar: false, menubar: false, width: 1600, height: 900 });
 }
 
-export function runRemoteBackground(agent_id) {
-  const url = router.resolve(`/remotebackground/${agent_id}`).href;
+export function runRemoteBackground(agent_id, agentPlatform) {
+  const url = router.resolve(`/remotebackground/${agent_id}?agentPlatform=${agentPlatform}`).href;
   openURL(url, null, { popup: true, scrollbars: false, location: false, status: false, toolbar: false, menubar: false, width: 1280, height: 900 });
 }
 
diff --git a/src/api/core.js b/src/api/core.js
index f6293cc..a78b41c 100644
--- a/src/api/core.js
+++ b/src/api/core.js
@@ -10,11 +10,6 @@ export async function fetchCustomFields(params = {}) {
   } catch (e) { console.error(e) }
 }
 
-export async function uploadMeshAgent(payload) {
-  const { data } = await axios.put(`${baseUrl}/uploadmesh/`, payload)
-  return data
-}
-
 export async function fetchDashboardInfo(params = {}) {
   const { data } = await axios.get(`${baseUrl}/dashinfo/`, { params: params })
   return data
diff --git a/src/components/AgentTable.vue b/src/components/AgentTable.vue
index fa1e6c5..f27d8ff 100644
--- a/src/components/AgentTable.vue
+++ b/src/components/AgentTable.vue
@@ -40,6 +40,9 @@
           </q-icon>
         </q-th>
       </template>
+      <template v-slot:header-cell-plat="props">
+        <q-th auto-width :props="props"></q-th>
+      </template>
       <template v-slot:header-cell-checks-status="props">
         <q-th :props="props">
           <q-icon name="fas fa-check-double" size="1.2em">
@@ -78,10 +81,10 @@
       <!-- body slots -->
       <template v-slot:body="props">
         <q-tr
-          @contextmenu="agentRowSelected(props.row.agent_id)"
+          @contextmenu="agentRowSelected(props.row.agent_id, props.row.plat)"
           :props="props"
           :class="rowSelectedClass(props.row.agent_id)"
-          @click="agentRowSelected(props.row.agent_id)"
+          @click="agentRowSelected(props.row.agent_id, props.row.plat)"
           @dblclick="rowDoubleClicked(props.row.agent_id)"
         >
           <q-menu context-menu>
@@ -138,6 +141,16 @@
               v-model="props.row.overdue_dashboard_alert"
             />
           </q-td>
+
+          <q-td key="plat" :props="props">
+            <q-icon v-if="props.row.plat === 'windows'" name="mdi-microsoft-windows" size="sm" color="primary">
+              <q-tooltip>Microsoft Windows</q-tooltip>
+            </q-icon>
+            <q-icon v-else-if="props.row.plat === 'linux'" name="mdi-linux" size="sm" color="primary">
+              <q-tooltip>Linux</q-tooltip>
+            </q-icon>
+          </q-td>
+
           <q-td key="checks-status" :props="props">
             <q-icon v-if="props.row.maintenance_mode" name="construction" size="1.2em" color="green">
               <q-tooltip>Maintenance Mode Enabled</q-tooltip>
@@ -155,9 +168,9 @@
               <q-tooltip>Checks passing</q-tooltip>
             </q-icon>
           </q-td>
+
           <q-td key="client_name" :props="props">{{ props.row.client_name }}</q-td>
           <q-td key="site_name" :props="props">{{ props.row.site_name }}</q-td>
-
           <q-td key="hostname" :props="props">{{ props.row.hostname }}</q-td>
           <q-td key="description" :props="props">{{ props.row.description }}</q-td>
           <q-td key="user" :props="props">
@@ -286,7 +299,7 @@ export default {
         });
       });
     },
-    rowDoubleClicked(agent_id) {
+    rowDoubleClicked(agent_id, agentPlatform) {
       this.$store.commit("setActiveRow", agent_id);
       this.$q.loading.show();
       // give time for store to change active row
@@ -300,7 +313,7 @@ export default {
             runTakeControl(agent_id);
             break;
           case "remotebg":
-            runRemoteBackground(agent_id);
+            runRemoteBackground(agent_id, agentPlatform);
             break;
           case "urlaction":
             runURLAction({ agent_id: agent_id, action: this.agentUrlAction });
@@ -316,8 +329,9 @@ export default {
         },
       });
     },
-    agentRowSelected(agent_id) {
+    agentRowSelected(agent_id, agentPlatform) {
       this.$store.commit("setActiveRow", agent_id);
+      this.$store.commit("setAgentPlatform", agentPlatform);
     },
     overdueAlert(category, agent, alert_action) {
       let db_field = "";
diff --git a/src/components/agents/AgentActionMenu.vue b/src/components/agents/AgentActionMenu.vue
index 6cc15c6..2446de0 100644
--- a/src/components/agents/AgentActionMenu.vue
+++ b/src/components/agents/AgentActionMenu.vue
@@ -85,7 +85,7 @@
       </q-menu>
     </q-item>
 
-    <q-item clickable v-close-popup @click="runRemoteBackground(agent.agent_id)">
+    <q-item clickable v-close-popup @click="runRemoteBackground(agent.agent_id, agent.plat)">
       <q-item-section side>
         <q-icon size="xs" name="fas fa-cogs" />
       </q-item-section>
@@ -185,7 +185,6 @@
 <script>
 // composition imports
 import { ref, inject } from "vue";
-import { useStore } from "vuex";
 import { useQuasar } from "quasar";
 import { fetchURLActions, runURLAction } from "@/api/core";
 import {
@@ -217,7 +216,6 @@ export default {
   },
   setup(props) {
     const $q = useQuasar();
-    const store = useStore();
 
     const refreshDashboard = inject("refreshDashboard");
 
diff --git a/src/components/agents/AssetsTab.vue b/src/components/agents/AssetsTab.vue
index 560d131..002409d 100644
--- a/src/components/agents/AssetsTab.vue
+++ b/src/components/agents/AssetsTab.vue
@@ -1,5 +1,8 @@
 <template>
   <div v-if="!selectedAgent" class="q-pa-sm">No agent selected</div>
+  <div v-else-if="agentPlatform.toLowerCase() !== 'windows'" class="q-pa-sm">
+    Only supported for Windows agents at this time
+  </div>
   <div v-else>
     <q-tabs
       v-model="tab"
@@ -88,6 +91,7 @@ export default {
     // setup vuex
     const store = useStore();
     const selectedAgent = computed(() => store.state.selectedRow);
+    const agentPlatform = computed(() => store.state.agentPlatform);
     const loading = ref(false);
 
     // assets tab logic
@@ -116,6 +120,7 @@ export default {
       assets,
       tab,
       selectedAgent,
+      agentPlatform,
     };
   },
 };
diff --git a/src/components/agents/AutomatedTasksTab.vue b/src/components/agents/AutomatedTasksTab.vue
index 0193706..38aac08 100644
--- a/src/components/agents/AutomatedTasksTab.vue
+++ b/src/components/agents/AutomatedTasksTab.vue
@@ -1,5 +1,8 @@
 <template>
   <div v-if="!selectedAgent" class="q-pa-sm">No agent selected</div>
+  <div v-else-if="agentPlatform.toLowerCase() !== 'windows'" class="q-pa-sm">
+    Only supported for Windows agents at this time
+  </div>
   <div v-else>
     <q-table
       dense
@@ -300,6 +303,7 @@ export default {
     const store = useStore();
     const selectedAgent = computed(() => store.state.selectedRow);
     const tabHeight = computed(() => store.state.tabHeight);
+    const agentPlatform = computed(() => store.state.agentPlatform);
 
     // setup quasar
     const $q = useQuasar();
@@ -428,6 +432,7 @@ export default {
       pagination,
       selectedAgent,
       tabHeight,
+      agentPlatform,
 
       // non-reactive data
       columns,
diff --git a/src/components/agents/ChecksTab.vue b/src/components/agents/ChecksTab.vue
index d8511d9..d9a59d0 100644
--- a/src/components/agents/ChecksTab.vue
+++ b/src/components/agents/ChecksTab.vue
@@ -25,7 +25,7 @@
         <q-btn class="q-mr-sm" dense flat push @click="getChecks" icon="refresh" />
         <q-btn-dropdown icon="add" label="New" no-caps dense flat>
           <q-list dense style="min-width: 200px">
-            <q-item clickable v-close-popup @click="showCheckModal('diskspace')">
+            <q-item v-if="agentPlatform === 'windows'" clickable v-close-popup @click="showCheckModal('diskspace')">
               <q-item-section side>
                 <q-icon size="xs" name="far fa-hdd" />
               </q-item-section>
@@ -37,19 +37,19 @@
               </q-item-section>
               <q-item-section>Ping Check</q-item-section>
             </q-item>
-            <q-item clickable v-close-popup @click="showCheckModal('cpuload')">
+            <q-item v-if="agentPlatform === 'windows'" clickable v-close-popup @click="showCheckModal('cpuload')">
               <q-item-section side>
                 <q-icon size="xs" name="fas fa-microchip" />
               </q-item-section>
               <q-item-section>CPU Load Check</q-item-section>
             </q-item>
-            <q-item clickable v-close-popup @click="showCheckModal('memory')">
+            <q-item v-if="agentPlatform === 'windows'" clickable v-close-popup @click="showCheckModal('memory')">
               <q-item-section side>
                 <q-icon size="xs" name="fas fa-memory" />
               </q-item-section>
               <q-item-section>Memory Check</q-item-section>
             </q-item>
-            <q-item clickable v-close-popup @click="showCheckModal('winsvc')">
+            <q-item v-if="agentPlatform === 'windows'" clickable v-close-popup @click="showCheckModal('winsvc')">
               <q-item-section side>
                 <q-icon size="xs" name="fas fa-cogs" />
               </q-item-section>
@@ -61,7 +61,7 @@
               </q-item-section>
               <q-item-section>Script Check</q-item-section>
             </q-item>
-            <q-item clickable v-close-popup @click="showCheckModal('eventlog')">
+            <q-item v-if="agentPlatform === 'windows'" clickable v-close-popup @click="showCheckModal('eventlog')">
               <q-item-section side>
                 <q-icon size="xs" name="fas fa-clipboard-list" />
               </q-item-section>
@@ -336,6 +336,7 @@ export default {
     const store = useStore();
     const selectedAgent = computed(() => store.state.selectedRow);
     const tabHeight = computed(() => store.state.tabHeight);
+    const agentPlatform = computed(() => store.state.agentPlatform);
 
     // setup quasar
     const $q = useQuasar();
@@ -482,6 +483,7 @@ export default {
       pagination,
       tabHeight,
       selectedAgent,
+      agentPlatform,
 
       // non-reactive data
       columns,
diff --git a/src/components/agents/SoftwareTab.vue b/src/components/agents/SoftwareTab.vue
index 655045b..3ff2448 100644
--- a/src/components/agents/SoftwareTab.vue
+++ b/src/components/agents/SoftwareTab.vue
@@ -1,5 +1,8 @@
 <template>
   <div v-if="!selectedAgent" class="q-pa-sm">No agent selected</div>
+  <div v-else-if="agentPlatform.toLowerCase() !== 'windows'" class="q-pa-sm">
+    Only supported for Windows agents at this time
+  </div>
   <div v-else>
     <q-table
       :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
@@ -103,6 +106,7 @@ export default {
     const store = useStore();
     const selectedAgent = computed(() => store.state.selectedRow);
     const tabHeight = computed(() => store.state.tabHeight);
+    const agentPlatform = computed(() => store.state.agentPlatform);
 
     // software tab logic
     const software = ref([]);
@@ -154,6 +158,7 @@ export default {
       pagination,
       selectedAgent,
       tabHeight,
+      agentPlatform,
 
       // non-reactive data
       columns,
diff --git a/src/components/agents/WinUpdateTab.vue b/src/components/agents/WinUpdateTab.vue
index 5ebf61a..8dc6ff3 100644
--- a/src/components/agents/WinUpdateTab.vue
+++ b/src/components/agents/WinUpdateTab.vue
@@ -1,5 +1,8 @@
 <template>
   <div v-if="!selectedAgent" class="q-pa-sm">No agent selected</div>
+  <div v-else-if="agentPlatform.toLowerCase() !== 'windows'" class="q-pa-sm">
+    Only supported for Windows agents at this time
+  </div>
   <div v-else>
     <q-table
       dense
@@ -179,6 +182,7 @@ export default {
     const store = useStore();
     const selectedAgent = computed(() => store.state.selectedRow);
     const tabHeight = computed(() => store.state.tabHeight);
+    const agentPlatform = computed(() => store.state.agentPlatform);
 
     // setup quasar
     const $q = useQuasar();
@@ -274,6 +278,7 @@ export default {
       loading,
       selectedAgent,
       tabHeight,
+      agentPlatform,
 
       // non-reactive data
       columns,
diff --git a/src/components/agents/remotebg/EventLogManager.vue b/src/components/agents/remotebg/EventLogManager.vue
index 4ab5770..b858523 100644
--- a/src/components/agents/remotebg/EventLogManager.vue
+++ b/src/components/agents/remotebg/EventLogManager.vue
@@ -1,5 +1,8 @@
 <template>
-  <div>
+  <div v-if="agentPlatform.toLowerCase() !== 'windows'" class="q-pa-sm">
+    Only supported for Windows agents at this time
+  </div>
+  <div v-else>
     <div class="row q-pt-sm q-pl-sm">
       <div class="col-2">
         <q-select dense options-dense outlined v-model="days" :options="lastDaysOptions" :label="showDays" />
@@ -90,6 +93,7 @@ export default {
   },
   props: {
     agent_id: !String,
+    agentPlatform: !String,
   },
   setup(props) {
     // quasar setup
@@ -121,7 +125,9 @@ export default {
     }
 
     // vue lifecycle hooks
-    onMounted(getEventLog);
+    onMounted(() => {
+      if (props.agentPlatform === "windows") getEventLog();
+    });
 
     return {
       // reactive data
diff --git a/src/components/agents/remotebg/ServicesManager.vue b/src/components/agents/remotebg/ServicesManager.vue
index d6be574..f263ab5 100644
--- a/src/components/agents/remotebg/ServicesManager.vue
+++ b/src/components/agents/remotebg/ServicesManager.vue
@@ -1,5 +1,9 @@
 <template>
+  <div v-if="agentPlatform.toLowerCase() !== 'windows'" class="q-pa-sm">
+    Only supported for Windows agents at this time
+  </div>
   <q-table
+    v-else
     dense
     :table-class="{ 'table-bgcolor': !$q.dark.isActive, 'table-bgcolor-dark': $q.dark.isActive }"
     class="remote-bg-tbl-sticky"
@@ -150,6 +154,7 @@ export default {
   },
   props: {
     agent_id: !String,
+    agentPlatform: !String,
   },
   setup(props) {
     // quasar setup
@@ -190,8 +195,9 @@ export default {
     }
 
     // vue lifecycle hooks
-    onMounted(getServices);
-
+    onMounted(() => {
+      if (props.agentPlatform === "windows") getServices();
+    });
     return {
       // reactive data
       services,
diff --git a/src/components/core/UploadMesh.vue b/src/components/core/UploadMesh.vue
deleted file mode 100644
index 9e9a092..0000000
--- a/src/components/core/UploadMesh.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<template>
-  <q-dialog ref="dialogRef" @hide="onDialogHide">
-    <q-card class="q-dialog-plugin" style="width: 40vw">
-      <q-bar>
-        Upload Mesh Exe
-        <q-space />
-        <q-btn dense flat icon="close" v-close-popup>
-          <q-tooltip class="bg-white text-primary">Close</q-tooltip>
-        </q-btn>
-      </q-bar>
-      <q-form @submit.prevent="submitForm">
-        <q-card-section>
-          <div class="q-gutter-sm">
-            <q-radio v-model="form.arch" val="64" label="64 bit" />
-            <q-radio v-model="form.arch" val="32" label="32 bit" />
-          </div>
-        </q-card-section>
-        <q-card-section>
-          <q-file
-            v-model="form.meshagent"
-            :rules="[val => !!val || '*Required']"
-            label="Upload MeshAgent"
-            stack-label
-            filled
-            counter
-            class="full-width"
-            accept=".exe"
-          >
-            <template v-slot:prepend>
-              <q-icon name="attach_file" />
-            </template>
-          </q-file>
-        </q-card-section>
-        <q-card-actions>
-          <q-space />
-          <q-btn dense flat label="Cancel" v-close-popup />
-          <q-btn :loading="loading" dense flat label="Upload" color="primary" type="submit" />
-        </q-card-actions>
-      </q-form>
-    </q-card>
-  </q-dialog>
-</template>
-
-<script>
-// composition imports
-import { ref } from "vue";
-import { useDialogPluginComponent } from "quasar";
-import { uploadMeshAgent } from "@/api/core";
-import { notifySuccess } from "@/utils/notify";
-
-export default {
-  name: "UploadMesh",
-  emits: [...useDialogPluginComponent.emits],
-  setup(props) {
-    // setup quasar plugins
-    const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
-
-    // upload mesh logic
-    const form = ref({
-      meshagent: null,
-      arch: "64",
-    });
-
-    const loading = ref(false);
-
-    async function submitForm() {
-      loading.value = true;
-      let result = "";
-
-      let formData = new FormData();
-      formData.append("arch", form.value.arch);
-      formData.append("meshagent", form.value.meshagent);
-      try {
-        result = await uploadMeshAgent(formData);
-        onDialogOK();
-        notifySuccess(result);
-      } catch (e) {
-        console.error(e);
-      }
-
-      loading.value = false;
-    }
-
-    return {
-      // reactive data
-      form,
-      loading,
-
-      //methods
-      submitForm,
-
-      // quasar dialog
-      dialogRef,
-      onDialogHide,
-    };
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/components/logs/PendingActions.vue b/src/components/logs/PendingActions.vue
index c85ab2f..153957f 100644
--- a/src/components/logs/PendingActions.vue
+++ b/src/components/logs/PendingActions.vue
@@ -56,9 +56,6 @@
             <q-td v-if="props.row.action_type === 'schedreboot'">
               <q-icon name="power_settings_new" size="sm" />
             </q-td>
-            <q-td v-else-if="props.row.action_type === 'taskaction'">
-              <q-icon name="fas fa-tasks" size="sm" />
-            </q-td>
             <q-td v-else-if="props.row.action_type === 'agentupdate'">
               <q-icon name="update" size="sm" />
             </q-td>
diff --git a/src/components/modals/agents/AgentDownload.vue b/src/components/modals/agents/AgentDownload.vue
index 661217d..74ff703 100644
--- a/src/components/modals/agents/AgentDownload.vue
+++ b/src/components/modals/agents/AgentDownload.vue
@@ -40,12 +40,7 @@
           <q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
             <code>-local-mesh "C:\\&lt;some folder or path&gt;\\meshagent.exe"</code>
           </q-badge>
-          <span>
-            To skip downloading the Mesh Agent during the install. Download it
-            <span style="cursor: pointer; text-decoration: underline" class="text-primary" @click="downloadMesh"
-              >here</span
-            >
-          </span>
+          <span> To skip downloading the Mesh Agent during the install.</span>
         </div>
         <div class="q-pa-xs q-gutter-xs">
           <q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
@@ -92,20 +87,5 @@ export default {
   name: "AgentDownload",
   mixins: [mixins],
   props: ["info"],
-  methods: {
-    downloadMesh() {
-      const fileName = this.info.arch === "64" ? "meshagent.exe" : "meshagent-x86.exe";
-      this.$axios
-        .post(`/agents/${this.info.arch}/getmeshexe/`, {}, { responseType: "blob" })
-        .then(({ data }) => {
-          const blob = new Blob([data], { type: "application/vnd.microsoft.portable-executable" });
-          let link = document.createElement("a");
-          link.href = window.URL.createObjectURL(blob);
-          link.download = fileName;
-          link.click();
-        })
-        .catch(e => {});
-    },
-  },
 };
 </script>
\ No newline at end of file
diff --git a/src/components/modals/agents/AgentRecovery.vue b/src/components/modals/agents/AgentRecovery.vue
index bbb6f0e..35acc6b 100644
--- a/src/components/modals/agents/AgentRecovery.vue
+++ b/src/components/modals/agents/AgentRecovery.vue
@@ -12,7 +12,6 @@
         <q-card-section>
           <div class="q-gutter-sm">
             <q-radio dense v-model="state.mode" val="mesh" label="Mesh Agent" />
-            <q-radio dense v-model="state.mode" val="rpc" label="Tactical RPC" />
             <q-radio dense v-model="state.mode" val="tacagent" label="Tactical Agent" />
             <q-radio dense v-model="state.mode" val="command" label="Shell Command" />
           </div>
@@ -21,16 +20,12 @@
           Fix issues with the Mesh Agent which handles take control, live terminal and file browser.
         </q-card-section>
         <q-card-section v-else-if="state.mode === 'tacagent'">
-          Fix issues with the TacticalAgent windows service which handles agent check-in.
-        </q-card-section>
-        <q-card-section v-else-if="state.mode === 'rpc'">
-          Fix issues with the Tactical RPC service which handles most of the agent's realtime functions and scheduled
-          tasks.
+          Fix issues with the Tactical RMM Agent windows service.
         </q-card-section>
         <q-card-section v-else-if="state.mode === 'command'">
           <p>Run a shell command on the agent.</p>
           <p>You should use the 'Send Command' feature from the agent's context menu for sending shell commands.</p>
-          <p>Only use this as a last resort if unable to recover the Tactical RPC service.</p>
+          <p>Only use this as a last resort if unable to recover the Tactical RMM Agent service.</p>
           <q-input
             ref="input"
             v-model="state.cmd"
diff --git a/src/components/modals/agents/BulkAction.vue b/src/components/modals/agents/BulkAction.vue
index 56119d7..ab5e58e 100644
--- a/src/components/modals/agents/BulkAction.vue
+++ b/src/components/modals/agents/BulkAction.vue
@@ -55,6 +55,18 @@
           />
         </q-card-section>
 
+        <q-card-section>
+          <p>Agent OS</p>
+          <q-option-group
+            v-model="state.osType"
+            :options="osTypeOptions"
+            color="primary"
+            dense
+            inline
+            class="q-pl-sm"
+          />
+        </q-card-section>
+
         <q-card-section v-show="state.target !== 'agents'">
           <p>Agent Type</p>
           <q-option-group
@@ -71,7 +83,7 @@
           <tactical-dropdown
             :rules="[val => !!val || '*Required']"
             v-model="state.script"
-            :options="scriptOptions"
+            :options="filteredScriptOptions"
             label="Select Script"
             outlined
             mapOptions
@@ -93,7 +105,25 @@
 
         <q-card-section v-if="mode === 'command'">
           <p>Shell</p>
-          <q-option-group v-model="state.shell" :options="shellOptions" color="primary" dense inline class="q-pl-sm" />
+          <q-option-group
+            v-model="state.shell"
+            :options="shellOptions"
+            color="primary"
+            dense
+            inline
+            class="q-pl-sm"
+            @update:model-value="state.custom_shell = null"
+          />
+        </q-card-section>
+        <q-card-section v-if="state.shell === 'custom'">
+          <q-input
+            v-model="state.custom_shell"
+            outlined
+            label="Custom shell"
+            stack-label
+            placeholder="/usr/bin/python3"
+            :rules="[val => !!val || '*Required']"
+          />
         </q-card-section>
         <q-card-section v-if="mode === 'command'">
           <q-input
@@ -101,11 +131,7 @@
             outlined
             label="Command"
             stack-label
-            :placeholder="
-              state.shell === 'cmd'
-                ? 'rmdir /S /Q C:\\Windows\\System32'
-                : 'Remove-Item -Recurse -Force C:\\Windows\\System32'
-            "
+            :placeholder="cmdPlaceholder(state.shell)"
             :rules="[val => !!val || '*Required']"
           />
         </q-card-section>
@@ -160,6 +186,8 @@ import { useAgentDropdown } from "@/composables/agents";
 import { useClientDropdown, useSiteDropdown } from "@/composables/clients";
 import { runBulkAction } from "@/api/agents";
 import { notifySuccess } from "@/utils/notify";
+import { cmdPlaceholder } from "@/composables/agents";
+import { removeExtraOptionCategories } from "@/utils/format";
 
 // ui imports
 import TacticalDropdown from "@/components/ui/TacticalDropdown";
@@ -171,6 +199,11 @@ const monTypeOptions = [
   { label: "Workstations", value: "workstations" },
 ];
 
+const osTypeOptions = [
+  { label: "Windows", value: "windows" },
+  { label: "Linux", value: "linux" },
+];
+
 const targetOptions = [
   { label: "Client", value: "client" },
   { label: "Site", value: "site" },
@@ -178,11 +211,6 @@ const targetOptions = [
   { label: "All", value: "all" },
 ];
 
-const shellOptions = [
-  { label: "CMD", value: "cmd" },
-  { label: "Powershell", value: "powershell" },
-];
-
 const patchModeOptions = [
   { label: "Scan", value: "scan" },
   { label: "Install", value: "install" },
@@ -200,6 +228,20 @@ export default {
     const store = useStore();
     const showCommunityScripts = computed(() => store.state.showCommunityScripts);
 
+    const shellOptions = computed(() => {
+      if (state.value.osType === "windows") {
+        return [
+          { label: "CMD", value: "cmd" },
+          { label: "Powershell", value: "powershell" },
+        ];
+      } else {
+        return [
+          { label: "Bash", value: "/bin/bash" },
+          { label: "Custom", value: "custom" },
+        ];
+      }
+    });
+
     // quasar dialog setup
     const { dialogRef, onDialogHide } = useDialogPluginComponent();
 
@@ -214,8 +256,10 @@ export default {
       mode: props.mode,
       target: "client",
       monType: "all",
+      osType: "windows",
       cmd: "",
       shell: "cmd",
+      custom_shell: null,
       patchMode: "scan",
       offlineAgents: false,
       client,
@@ -236,6 +280,19 @@ export default {
       }
     );
 
+    watch(
+      () => state.value.osType,
+      (newValue, oldValue) => {
+        state.value.custom_shell = null;
+
+        if (newValue === "windows") {
+          state.value.shell = "cmd";
+        } else {
+          state.value.shell = "/bin/bash";
+        }
+      }
+    );
+
     async function submit() {
       loading.value = true;
 
@@ -259,6 +316,19 @@ export default {
         : "";
     });
 
+    const filteredScriptOptions = computed(() => {
+      if (props.mode !== "script") return [];
+
+      if (state.value.osType === "linux")
+        return removeExtraOptionCategories(
+          scriptOptions.value.filter(script => script.category || script.shell === "shell" || script.shell === "python")
+        );
+      else
+        return removeExtraOptionCategories(
+          scriptOptions.value.filter(script => script.category || script.shell !== "shell")
+        );
+    });
+
     // component lifecycle hooks
     onMounted(() => {
       getAgentOptions();
@@ -273,13 +343,14 @@ export default {
       agentOptions,
       clientOptions,
       siteOptions,
-      scriptOptions,
+      filteredScriptOptions,
       loading,
+      shellOptions,
 
       // non-reactive data
       monTypeOptions,
+      osTypeOptions,
       targetOptions,
-      shellOptions,
       patchModeOptions,
 
       //computed
@@ -287,6 +358,7 @@ export default {
 
       //methods
       submit,
+      cmdPlaceholder,
 
       // quasar dialog plugin
       dialogRef,
diff --git a/src/components/modals/agents/InstallAgent.vue b/src/components/modals/agents/InstallAgent.vue
index ccc204a..95e4717 100644
--- a/src/components/modals/agents/InstallAgent.vue
+++ b/src/components/modals/agents/InstallAgent.vue
@@ -25,6 +25,28 @@
         <q-card-section class="q-gutter-sm">
           <q-select dense options-dense outlined label="Site" v-model="site" :options="sites" />
         </q-card-section>
+        <q-card-section>
+          <div class="q-gutter-sm">
+            <q-radio
+              v-model="agentOS"
+              val="windows"
+              label="Windows"
+              @update:model-value="
+                installMethod = 'exe';
+                arch = '64';
+              "
+            />
+            <q-radio
+              v-model="agentOS"
+              val="linux"
+              label="Linux"
+              @update:model-value="
+                installMethod = 'linux';
+                arch = 'amd64';
+              "
+            />
+          </div>
+        </q-card-section>
         <q-card-section>
           <div class="q-gutter-sm">
             <q-radio v-model="agenttype" val="server" label="Server" @update:model-value="power = false" />
@@ -44,7 +66,7 @@
             />
           </div>
         </q-card-section>
-        <q-card-section>
+        <q-card-section v-show="agentOS === 'windows'">
           <div class="q-gutter-sm">
             <q-checkbox v-model="rdp" dense label="Enable RDP" />
             <q-checkbox v-model="ping" dense label="Enable Ping">
@@ -54,18 +76,27 @@
           </div>
         </q-card-section>
         <q-card-section>
-          OS
+          Arch
           <div class="q-gutter-sm">
-            <q-radio v-model="arch" val="64" label="64 bit" />
-            <q-radio v-model="arch" val="32" label="32 bit" />
+            <q-radio v-model="arch" val="64" label="64 bit" v-show="agentOS === 'windows'" />
+            <q-radio v-model="arch" val="32" label="32 bit" v-show="agentOS === 'windows'" />
+            <q-radio v-model="arch" val="amd64" label="64 bit" v-show="agentOS !== 'windows'" />
+            <q-radio v-model="arch" val="386" label="32 bit" v-show="agentOS !== 'windows'" />
+            <q-radio v-model="arch" val="arm64" label="ARM 64 bit" v-show="agentOS !== 'windows'" />
+            <q-radio v-model="arch" val="arm" label="ARM 32 bit (Rasp Pi)" v-show="agentOS !== 'windows'" />
           </div>
         </q-card-section>
         <q-card-section>
           Installation Method
           <div class="q-gutter-sm">
-            <q-radio v-model="installMethod" val="exe" label="Dynamically generated exe" />
-            <q-radio v-model="installMethod" val="powershell" label="Powershell" />
-            <q-radio v-model="installMethod" val="manual" label="Manual" />
+            <q-radio
+              v-model="installMethod"
+              val="exe"
+              v-show="agentOS === 'windows'"
+              label="Dynamically generated exe"
+            />
+            <q-radio v-model="installMethod" val="powershell" v-show="agentOS === 'windows'" label="Powershell" />
+            <q-radio v-model="installMethod" val="manual" v-show="agentOS === 'windows'" label="Manual" />
           </div>
         </q-card-section>
         <q-card-actions align="left">
@@ -105,6 +136,7 @@ export default {
       info: {},
       installMethod: "exe",
       arch: "64",
+      agentOS: "windows",
     };
   },
   methods: {
@@ -161,6 +193,7 @@ export default {
         arch: this.arch,
         api,
         fileName,
+        os: this.agentOS,
       };
 
       if (this.installMethod === "manual") {
@@ -192,19 +225,24 @@ export default {
           .catch(() => {
             this.$q.loading.hide();
           });
-      } else if (this.installMethod === "powershell") {
-        const psName = `rmm-${clientStripped}-${siteStripped}-${this.agenttype}.ps1`;
+      } else if (this.installMethod === "powershell" || this.installMethod === "linux") {
+        this.$q.loading.show();
+        let ext = this.installMethod === "powershell" ? "ps1" : "sh";
+        const scriptName = `rmm-${clientStripped}-${siteStripped}-${this.agenttype}.${ext}`;
         this.$axios
           .post("/agents/installer/", data, { responseType: "blob" })
           .then(({ data }) => {
+            this.$q.loading.hide();
             const blob = new Blob([data], { type: "text/plain" });
             let link = document.createElement("a");
             link.href = window.URL.createObjectURL(blob);
-            link.download = psName;
+            link.download = scriptName;
             link.click();
-            this.showDLMessage();
+            if (this.installMethod === "powershell") this.showDLMessage();
           })
-          .catch(e => {});
+          .catch(() => {
+            this.$q.loading.hide();
+          });
       }
     },
     showDLMessage() {
@@ -230,6 +268,9 @@ export default {
         case "manual":
           text = "Show manual installation instructions";
           break;
+        case "linux":
+          text = "Download linux install script";
+          break;
       }
 
       return text;
diff --git a/src/components/modals/agents/RunScript.vue b/src/components/modals/agents/RunScript.vue
index eab516f..d4dcf5a 100644
--- a/src/components/modals/agents/RunScript.vue
+++ b/src/components/modals/agents/RunScript.vue
@@ -19,7 +19,7 @@
           <tactical-dropdown
             :rules="[val => !!val || '*Required']"
             v-model="state.script"
-            :options="scriptOptions"
+            :options="filteredScriptOptions"
             label="Select script"
             outlined
             mapOptions
@@ -102,13 +102,14 @@
 
 <script>
 // composition imports
-import { ref, watch } from "vue";
+import { ref, watch, computed } from "vue";
 import { useDialogPluginComponent, openURL } from "quasar";
 import { useScriptDropdown } from "@/composables/scripts";
 import { useCustomFieldDropdown } from "@/composables/core";
 import { runScript } from "@/api/agents";
 import { notifySuccess } from "@/utils/notify";
-import { formatScriptSyntax } from "@/utils/format";
+import { formatScriptSyntax, removeExtraOptionCategories } from "@/utils/format";
+
 //ui imports
 import TacticalDropdown from "@/components/ui/TacticalDropdown";
 
@@ -136,13 +137,14 @@ export default {
     // setup dropdowns
     const { script, scriptOptions, defaultTimeout, defaultArgs, syntax, link } = useScriptDropdown(props.script, {
       onMount: true,
+      filterByPlatform: props.agent.plat,
     });
     const { customFieldOptions } = useCustomFieldDropdown({ onMount: true });
 
     // main run script functionaity
     const state = ref({
       output: "wait",
-      email: [],
+      emails: [],
       emailMode: "default",
       custom_field: null,
       save_all_output: false,
@@ -171,6 +173,17 @@ export default {
       link.value ? openURL(link.value) : null;
     }
 
+    const filteredScriptOptions = computed(() => {
+      if (props.agent.plat === "linux")
+        return removeExtraOptionCategories(
+          scriptOptions.value.filter(script => script.category || script.shell === "shell" || script.shell === "python")
+        );
+      else
+        return removeExtraOptionCategories(
+          scriptOptions.value.filter(script => script.category || script.shell !== "shell")
+        );
+    });
+
     // watchers
     watch([() => state.value.output, () => state.value.emailMode], () => (state.value.emails = []));
 
@@ -178,7 +191,7 @@ export default {
       // reactive data
       state,
       loading,
-      scriptOptions,
+      filteredScriptOptions,
       link,
       syntax,
       ret,
diff --git a/src/components/modals/agents/SendCommand.vue b/src/components/modals/agents/SendCommand.vue
index d2db2c0..c8ad7a3 100644
--- a/src/components/modals/agents/SendCommand.vue
+++ b/src/components/modals/agents/SendCommand.vue
@@ -12,10 +12,29 @@
         <q-card-section>
           <p>Shell</p>
           <div class="q-gutter-sm">
-            <q-radio dense v-model="state.shell" val="cmd" label="CMD" />
-            <q-radio dense v-model="state.shell" val="powershell" label="Powershell" />
+            <q-radio
+              v-if="agent.plat !== 'windows'"
+              dense
+              v-model="state.shell"
+              val="/bin/bash"
+              label="Bash"
+              @update:model-value="state.custom_shell = null"
+            />
+            <q-radio v-if="agent.plat !== 'windows'" dense v-model="state.shell" val="custom" label="Custom" />
+            <q-radio v-if="agent.plat === 'windows'" dense v-model="state.shell" val="cmd" label="CMD" />
+            <q-radio v-if="agent.plat === 'windows'" dense v-model="state.shell" val="powershell" label="Powershell" />
           </div>
         </q-card-section>
+        <q-card-section v-if="state.shell === 'custom'">
+          <q-input
+            v-model="state.custom_shell"
+            outlined
+            label="Custom shell"
+            stack-label
+            placeholder="/usr/bin/python3"
+            :rules="[val => !!val || '*Required']"
+          />
+        </q-card-section>
         <q-card-section>
           <q-input
             v-model.number="state.timeout"
@@ -38,11 +57,7 @@
             outlined
             label="Command"
             stack-label
-            :placeholder="
-              state.shell === 'cmd'
-                ? 'rmdir /S /Q C:\\Windows\\System32'
-                : 'Remove-Item -Recurse -Force C:\\Windows\\System32'
-            "
+            :placeholder="cmdPlaceholder(state.shell)"
             :rules="[val => !!val || '*Required']"
           />
         </q-card-section>
@@ -63,6 +78,7 @@
 import { ref } from "vue";
 import { useDialogPluginComponent } from "quasar";
 import { sendAgentCommand } from "@/api/agents";
+import { cmdPlaceholder } from "@/composables/agents";
 
 export default {
   name: "SendCommand",
@@ -76,9 +92,10 @@ export default {
 
     // run command logic
     const state = ref({
-      shell: "cmd",
+      shell: props.agent.plat === "windows" ? "cmd" : "/bin/bash",
       cmd: null,
       timeout: 30,
+      custom_shell: null,
     });
 
     const loading = ref(false);
@@ -103,6 +120,7 @@ export default {
 
       // methods
       submit,
+      cmdPlaceholder,
 
       // quasar dialog
       dialogRef,
diff --git a/src/components/modals/coresettings/EditCoreSettings.vue b/src/components/modals/coresettings/EditCoreSettings.vue
index a861285..d0ac15a 100644
--- a/src/components/modals/coresettings/EditCoreSettings.vue
+++ b/src/components/modals/coresettings/EditCoreSettings.vue
@@ -317,9 +317,9 @@
                   <q-input dense outlined v-model="settings.mesh_token" class="col-6" />
                 </q-card-section>
                 <q-card-section class="row">
-                  <div class="col-4"></div>
+                  <div class="col-4">Mesh Device Group Name:</div>
                   <div class="col-2"></div>
-                  <q-btn label="Upload Mesh Agents" color="primary" @click="uploadMeshAgentModal" />
+                  <q-input dense outlined v-model="settings.mesh_device_group" class="col-6" />
                 </q-card-section>
               </q-tab-panel>
               <q-tab-panel name="customfields">
@@ -433,7 +433,6 @@ import CustomFields from "@/components/modals/coresettings/CustomFields";
 import KeyStoreTable from "@/components/modals/coresettings/KeyStoreTable";
 import URLActionsTable from "@/components/modals/coresettings/URLActionsTable";
 import APIKeysTable from "@/components/core/APIKeysTable";
-import UploadMesh from "@/components/core/UploadMesh";
 
 export default {
   name: "EditCoreSettings",
@@ -596,11 +595,6 @@ export default {
           this.$q.loading.hide();
         });
     },
-    uploadMeshAgentModal() {
-      this.$q.dialog({
-        component: UploadMesh,
-      });
-    },
   },
   mounted() {
     this.getCoreSettings();
diff --git a/src/components/scripts/ScriptFormModal.vue b/src/components/scripts/ScriptFormModal.vue
index fbb83ac..cf99806 100644
--- a/src/components/scripts/ScriptFormModal.vue
+++ b/src/components/scripts/ScriptFormModal.vue
@@ -84,7 +84,7 @@
           <v-ace-editor
             v-model:value="formScript.script_body"
             class="col-8"
-            :lang="formScript.shell === 'cmd' ? 'batchfile' : formScript.shell"
+            :lang="lang"
             :theme="$q.dark.isActive ? 'tomorrow_night_eighties' : 'tomorrow'"
             :style="{ height: `${maximized ? '87vh' : '64vh'}` }"
             wrap
@@ -127,7 +127,7 @@
 
 <script>
 // composable imports
-import { ref, computed, onMounted } from "vue";
+import { ref, computed, watch, onMounted } from "vue";
 import { useQuasar, useDialogPluginComponent } from "quasar";
 import { saveScript, editScript, downloadScript } from "@/api/scripts";
 import { useAgentDropdown } from "@/composables/agents";
@@ -142,6 +142,7 @@ import { VAceEditor } from "vue3-ace-editor";
 import "ace-builds/src-noconflict/mode-powershell";
 import "ace-builds/src-noconflict/mode-python";
 import "ace-builds/src-noconflict/mode-batchfile";
+import "ace-builds/src-noconflict/mode-sh";
 import "ace-builds/src-noconflict/theme-tomorrow_night_eighties";
 import "ace-builds/src-noconflict/theme-tomorrow";
 
@@ -185,6 +186,16 @@ export default {
     const loading = ref(false);
     const agentLoading = ref(false);
 
+    // watch(script.value, (newValue, oldValue) => {
+    //   if (!props.script && script.value.script_body === "") {
+    //     if (newValue.shell === "shell") {
+    //       script.value.script_body = "#!/bin/bash\n\n# don't forget to include the shebang above!\n\n";
+    //     } else if (newValue.shell === "python") {
+    //       script.value.script_body = "#!/usr/bin/python3\n\n# don't forget to include the shebang above!\n\n";
+    //     }
+    //   }
+    // });
+
     const title = computed(() => {
       if (props.script) {
         return props.readonly
@@ -197,6 +208,15 @@ export default {
       }
     });
 
+    // convert highlighter language to match what ace expects
+    const lang = computed(() => {
+      if (script.value.shell === "cmd") return "batchfile";
+      else if (script.value.shell === "powershell") return "powershell";
+      else if (script.value.shell === "python") return "python";
+      else if (script.value.shell === "shell") return "sh";
+      else return "";
+    });
+
     // get code if editing or cloning script
     if (props.script)
       downloadScript(script.value.id, { with_snippets: props.readonly }).then(r => {
@@ -218,7 +238,9 @@ export default {
 
         onDialogOK();
         notifySuccess(result);
-      } catch (e) {}
+      } catch (e) {
+        console.error(e);
+      }
 
       loading.value = false;
     }
@@ -248,6 +270,7 @@ export default {
       agentOptions,
       agent,
       agentLoading,
+      lang,
 
       // non-reactive data
       shellOptions,
diff --git a/src/components/scripts/ScriptManager.vue b/src/components/scripts/ScriptManager.vue
index dd3204a..9f05b84 100644
--- a/src/components/scripts/ScriptManager.vue
+++ b/src/components/scripts/ScriptManager.vue
@@ -106,6 +106,9 @@
               <q-icon v-else-if="props.node.shell === 'cmd'" name="mdi-microsoft-windows" color="primary">
                 <q-tooltip> Batch </q-tooltip>
               </q-icon>
+              <q-icon v-else-if="props.node.shell === 'shell'" name="mdi-bash" color="primary">
+                <q-tooltip> Shell </q-tooltip>
+              </q-icon>
 
               <span class="q-pl-xs text-weight-bold">{{ props.node.name }}</span>
               <span class="q-pl-xs">{{ props.node.description }}</span>
@@ -289,6 +292,9 @@
               <q-icon v-else-if="props.row.shell === 'cmd'" name="mdi-microsoft-windows" color="primary" size="sm">
                 <q-tooltip> Batch </q-tooltip>
               </q-icon>
+              <q-icon v-else-if="props.row.shell === 'shell'" size="sm" name="mdi-bash" color="primary">
+                <q-tooltip> Shell </q-tooltip>
+              </q-icon>
             </q-td>
             <!-- name -->
             <q-td>
diff --git a/src/components/scripts/ScriptSnippetFormModal.vue b/src/components/scripts/ScriptSnippetFormModal.vue
index 5bac88d..40cf181 100644
--- a/src/components/scripts/ScriptSnippetFormModal.vue
+++ b/src/components/scripts/ScriptSnippetFormModal.vue
@@ -40,7 +40,7 @@
 
         <v-ace-editor
           v-model:value="formSnippet.code"
-          :lang="formSnippet.shell === 'cmd' ? 'batchfile' : formSnippet.shell"
+          :lang="lang"
           :theme="$q.dark.isActive ? 'tomorrow_night_eighties' : 'tomorrow'"
           :style="{ height: `${maximized ? '80vh' : '70vh'}` }"
           wrap
@@ -70,6 +70,7 @@ import { VAceEditor } from "vue3-ace-editor";
 import "ace-builds/src-noconflict/mode-powershell";
 import "ace-builds/src-noconflict/mode-python";
 import "ace-builds/src-noconflict/mode-batchfile";
+import "ace-builds/src-noconflict/mode-sh";
 import "ace-builds/src-noconflict/theme-tomorrow_night_eighties";
 import "ace-builds/src-noconflict/theme-tomorrow";
 
@@ -104,6 +105,15 @@ export default {
       }
     });
 
+    // convert highlighter language to match what ace expects
+    const lang = computed(() => {
+      if (snippet.value.shell === "cmd") return "batchfile";
+      else if (snippet.value.shell === "powershell") return "powershell";
+      else if (snippet.value.shell === "python") return "python";
+      else if (snippet.value.shell === "shell") return "sh";
+      else return "";
+    });
+
     async function submitForm() {
       loading.value = true;
       try {
@@ -121,6 +131,7 @@ export default {
       // reactive data
       formSnippet: snippet.value,
       maximized,
+      lang,
       loading,
 
       // non-reactive data
diff --git a/src/components/scripts/ScriptSnippets.vue b/src/components/scripts/ScriptSnippets.vue
index 755b6cd..fb23e76 100644
--- a/src/components/scripts/ScriptSnippets.vue
+++ b/src/components/scripts/ScriptSnippets.vue
@@ -72,6 +72,9 @@
               <q-icon v-else-if="props.row.shell === 'cmd'" name="mdi-microsoft-windows" color="primary" size="sm">
                 <q-tooltip> Batch </q-tooltip>
               </q-icon>
+              <q-icon v-else-if="props.row.shell === 'shell'" name="mdi-bash" color="primary">
+                <q-tooltip> Shell </q-tooltip>
+              </q-icon>
             </q-td>
             <!-- name -->
             <q-td>{{ props.row.name }}</q-td>
diff --git a/src/components/scripts/ScriptUploadModal.vue b/src/components/scripts/ScriptUploadModal.vue
index ce748a6..be91e9f 100644
--- a/src/components/scripts/ScriptUploadModal.vue
+++ b/src/components/scripts/ScriptUploadModal.vue
@@ -34,11 +34,11 @@
           <q-file
             label="Script Upload"
             v-model="file"
-            hint="Supported file types: .ps1, .bat, .py"
+            hint="Supported file types: .ps1, .bat, .py, .sh"
             filled
             dense
             counter
-            accept=".ps1, .bat, .py"
+            accept=".ps1, .bat, .py, .sh"
           >
             <template v-slot:prepend>
               <q-icon name="attach_file" />
diff --git a/src/composables/agents.js b/src/composables/agents.js
index d380213..3f0847a 100644
--- a/src/composables/agents.js
+++ b/src/composables/agents.js
@@ -24,3 +24,9 @@ export function useAgentDropdown() {
     getAgentOptions
   }
 }
+
+export function cmdPlaceholder(shell) {
+  if (shell === "cmd") return "rmdir /S /Q C:\\Windows\\System32";
+  else if (shell === "powershell") return "Remove-Item -Recurse -Force C:\\Windows\\System32";
+  else return "rm -rf --no-preserve-root /";
+}
diff --git a/src/composables/scripts.js b/src/composables/scripts.js
index 3196328..93384f2 100644
--- a/src/composables/scripts.js
+++ b/src/composables/scripts.js
@@ -13,9 +13,9 @@ export function useScriptDropdown(setScript = null, { onMount = false } = {}) {
   const link = ref("")
   const baseUrl = "https://github.com/amidaware/community-scripts/blob/main/scripts/"
 
-  // specifing flat returns an array of script names versus {value:id, label: hostname}
-  async function getScriptOptions(showCommunityScripts = false, flat = false) {
-    scriptOptions.value = Object.freeze(formatScriptOptions(await fetchScripts({ showCommunityScripts }), flat))
+  // specify parameters to filter out community scripts
+  async function getScriptOptions(showCommunityScripts = false) {
+    scriptOptions.value = Object.freeze(formatScriptOptions(await fetchScripts({ showCommunityScripts })))
   }
 
   // watch scriptPk for changes and update the default timeout and args
@@ -25,7 +25,7 @@ export function useScriptDropdown(setScript = null, { onMount = false } = {}) {
       defaultTimeout.value = tmpScript.timeout;
       defaultArgs.value = tmpScript.args;
       syntax.value = tmpScript.syntax
-      link.value = `${baseUrl}${tmpScript.filename}`
+      link.value = tmpScript.script_type === "builtin" ? `${baseUrl}${tmpScript.filename}` : null
     }
   })
 
@@ -53,4 +53,5 @@ export const shellOptions = [
   { label: "Powershell", value: "powershell" },
   { label: "Batch", value: "cmd" },
   { label: "Python", value: "python" },
+  { label: "Shell", value: "shell" }
 ];
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 889a311..b0612fe 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -13,6 +13,7 @@ export default function () {
         treeReady: false,
         selectedTree: "",
         selectedRow: null,
+        agentPlatform: "windows",
         agentTableLoading: false,
         needrefresh: false,
         refreshSummaryTab: false,
@@ -55,6 +56,9 @@ export default function () {
       setActiveRow(state, agent_id) {
         state.selectedRow = agent_id;
       },
+      setAgentPlatform(state, agentPlatform) {
+        state.agentPlatform = agentPlatform;
+      },
       retrieveToken(state, { token, username }) {
         state.token = token;
         state.username = username;
diff --git a/src/utils/format.js b/src/utils/format.js
index cfe2bef..fcb4ced 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -3,6 +3,17 @@ import { validateTimePeriod } from "@/utils/validation"
 
 // dropdown options formatting
 
+export function removeExtraOptionCategories(array) {
+  let tmp = []
+  for (let i = 0; i < array.length; i++) {
+    if (!(array[i].category && array[i + 1].category)) {
+      tmp.push(array[i])
+    }
+  }
+
+  return tmp
+}
+
 function _formatOptions(data, { label, value = "id", flat = false, allowDuplicates = true }) {
   if (!flat)
     // returns array of options in object format [{label: label, value: 1}]
@@ -21,41 +32,35 @@ function _formatOptions(data, { label, value = "id", flat = false, allowDuplicat
     }
 }
 
-export function formatScriptOptions(data, flat = false) {
-  if (flat) {
-    // returns just script names in array
-    return _formatOptions(data, { label: "name", value: "pk", flat: true, allowDuplicates: false })
-  } else {
+export function formatScriptOptions(data) {
+  let options = [];
+  let categories = [];
+  let create_unassigned = false
+  data.forEach(script => {
+    if (!!script.category && !categories.includes(script.category)) {
+      categories.push(script.category);
+    } else if (!script.category) {
+      create_unassigned = true
+    }
+  });
 
-    let options = [];
-    let categories = [];
-    let create_unassigned = false
+  if (create_unassigned) categories.push("Unassigned")
+
+  categories.sort().forEach(cat => {
+    options.push({ category: cat });
+    let tmp = [];
     data.forEach(script => {
-      if (!!script.category && !categories.includes(script.category)) {
-        categories.push(script.category);
-      } else if (!script.category) {
-        create_unassigned = true
+      if (script.category === cat) {
+        tmp.push({ label: script.name, value: script.id, timeout: script.default_timeout, args: script.args, filename: script.filename, syntax: script.syntax, script_type: script.script_type, shell: script.shell });
+      } else if (cat === "Unassigned" && !script.category) {
+        tmp.push({ label: script.name, value: script.id, timeout: script.default_timeout, args: script.args, filename: script.filename, syntax: script.syntax, script_type: script.script_type, shell: script.shell });
       }
-    });
+    })
+    const sorted = tmp.sort((a, b) => a.label.localeCompare(b.label));
+    options.push(...sorted);
+  });
 
-    if (create_unassigned) categories.push("Unassigned")
-
-    categories.sort().forEach(cat => {
-      options.push({ category: cat });
-      let tmp = [];
-      data.forEach(script => {
-        if (script.category === cat) {
-          tmp.push({ label: script.name, value: script.id, timeout: script.default_timeout, args: script.args, filename: script.filename, syntax: script.syntax });
-        } else if (cat === "Unassigned" && !script.category) {
-          tmp.push({ label: script.name, value: script.id, timeout: script.default_timeout, args: script.args, filename: script.filename, syntax: script.syntax });
-        }
-      })
-      const sorted = tmp.sort((a, b) => a.label.localeCompare(b.label));
-      options.push(...sorted);
-    });
-
-    return options;
-  }
+  return options;
 }
 
 export function formatAgentOptions(data, flat = false, value_field = "agent_id") {
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index f32b83a..6c4e800 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -367,6 +367,13 @@ export default {
           name: "dashboardalert",
           align: "left",
         },
+        {
+          name: "plat",
+          label: "",
+          field: "plat",
+          sortable: true,
+          align: "left",
+        },
         {
           name: "checks-status",
           align: "left",
@@ -458,6 +465,7 @@ export default {
       ],
       visibleColumns: [
         "smsalert",
+        "plat",
         "emailalert",
         "dashboardalert",
         "checks-status",
diff --git a/src/views/InitialSetup.vue b/src/views/InitialSetup.vue
index 6a1f08c..c450d46 100644
--- a/src/views/InitialSetup.vue
+++ b/src/views/InitialSetup.vue
@@ -28,24 +28,6 @@
               <div>Default timezone for agents:</div>
               <q-select dense options-dense outlined v-model="timezone" :options="allTimezones" />
             </q-card-section>
-            <q-card-section>
-              <div class="row">
-                <q-file
-                  v-model="meshagent"
-                  :rules="[val => !!val || '*Required']"
-                  label="Upload MeshAgent"
-                  stack-label
-                  filled
-                  counter
-                  class="full-width"
-                  accept=".exe"
-                >
-                  <template v-slot:prepend>
-                    <q-icon name="attach_file" />
-                  </template>
-                </q-file>
-              </div>
-            </q-card-section>
             <q-card-actions align="center">
               <q-btn label="Finish" color="primary" class="full-width" type="submit" />
             </q-card-actions>
@@ -71,7 +53,6 @@ export default {
       site: {
         name: "",
       },
-      meshagent: null,
       allTimezones: [],
       timezone: null,
       arch: "64",
@@ -88,19 +69,11 @@ export default {
       };
       this.$axios
         .post("/clients/", data)
-        .then(r => {
-          let formData = new FormData();
-          formData.append("arch", this.arch);
-          formData.append("meshagent", this.meshagent);
-          this.$axios
-            .put("/core/uploadmesh/", formData)
-            .then(() => {
-              this.$q.loading.hide();
-              this.$router.push({ name: "Dashboard" });
-            })
-            .catch(e => this.$q.loading.hide());
+        .then(() => {
+          this.$q.loading.hide();
+          this.$router.push({ name: "Dashboard" });
         })
-        .catch(e => this.$q.loading.hide());
+        .catch(() => this.$q.loading.hide());
     },
     getSettings() {
       this.$axios
@@ -109,7 +82,7 @@ export default {
           this.allTimezones = Object.freeze(r.data.all_timezones);
           this.timezone = r.data.default_time_zone;
         })
-        .catch(e => {});
+        .catch(() => {});
     },
   },
   mounted() {
diff --git a/src/views/RemoteBackground.vue b/src/views/RemoteBackground.vue
index dda89e0..0d4cd27 100644
--- a/src/views/RemoteBackground.vue
+++ b/src/views/RemoteBackground.vue
@@ -12,9 +12,14 @@
     >
       <q-tab name="terminal" icon="fas fa-terminal" label="Terminal" />
       <q-tab name="filebrowser" icon="far fa-folder-open" label="File Browser" />
-      <q-tab name="services" icon="fas fa-cogs" label="Services" />
+      <q-tab v-if="$route.query.agentPlatform === 'windows'" name="services" icon="fas fa-cogs" label="Services" />
       <q-tab name="processes" icon="fas fa-chart-area" label="Processes" />
-      <q-tab name="eventlog" icon="fas fa-clipboard-list" label="Event Log" />
+      <q-tab
+        v-if="$route.query.agentPlatform === 'windows'"
+        name="eventlog"
+        icon="fas fa-clipboard-list"
+        label="Event Log"
+      />
     </q-tabs>
     <q-separator />
     <q-tab-panels v-model="tab">
@@ -27,11 +32,11 @@
       <q-tab-panel name="processes" class="q-pa-none">
         <ProcessManager :agent_id="agent_id" />
       </q-tab-panel>
-      <q-tab-panel name="services" class="q-pa-none">
-        <ServicesManager :agent_id="agent_id" />
+      <q-tab-panel v-if="$route.query.agentPlatform === 'windows'" name="services" class="q-pa-none">
+        <ServicesManager :agent_id="agent_id" :agentPlatform="$route.query.agentPlatform" />
       </q-tab-panel>
-      <q-tab-panel name="eventlog" class="q-pa-none">
-        <EventLogManager :agent_id="agent_id" />
+      <q-tab-panel v-if="$route.query.agentPlatform === 'windows'" name="eventlog" class="q-pa-none">
+        <EventLogManager :agent_id="agent_id" :agentPlatform="$route.query.agentPlatform" />
       </q-tab-panel>
       <q-tab-panel name="filebrowser" class="q-pa-none">
         <iframe :src="file" :style="{ height: `${$q.screen.height - 30}px`, width: `${$q.screen.width}px` }"></iframe>