[pull] main from amidaware:main

.vscode/settings.json

@@ -1,87 +1,83 @@
 {
-    "python.defaultInterpreterPath": "env/bin/python",
-    "python.languageServer": "Pylance",
-    "python.analysis.extraPaths": [
-        "env"
-    ],
-    "python.testing.pytestEnabled": true,
-    "python.analysis.diagnosticSeverityOverrides": {
-        "reportUnusedImport": "error",
-        "reportDuplicateImport": "error",
-    },
-    "python.analysis.typeCheckingMode": "basic",
-    "python.formatting.provider": "black",
-    "editor.formatOnSave": true,
-    "files.watcherExclude": {
-        "files.watcherExclude": {
-            "**/.git/objects/**": true,
-            "**/.git/subtree-cache/**": true,
-            "**/node_modules/": true,
-            "/node_modules/**": true,
-            "**/env/": true,
-            "/env/**": true,
-            "**/__pycache__": true,
-            "/__pycache__/**": true,
-            "**/.cache": true,
-            "**/.eggs": true,
-            "**/.ipynb_checkpoints": true,
-            "**/.mypy_cache": true,
-            "**/.pytest_cache": true,
-            "**/*.egg-info": true,
-            "**/*.feather": true,
-            "**/*.parquet*": true,
-            "**/*.pyc": true,
-            "**/*.zip": true
-        },
-    },
-    "cSpell.words": [
-        "ADDC",
-        "agentname",
-        "Antispyware",
-        "Antiviruses",
-        "Anynet",
-        "apitw",
-        "Autorun",
-        "bdexe",
-        "bdfb",
-        "bdurl",
-        "Bitdefender",
-        "Bitlocker",
-        "Bluescreen",
-        "BSOD",
-        "Clearand",
-        "clientname",
-        "Cortana",
-        "customidtw",
-        "Debugmode",
-        "DIMM's",
-        "Duplicati",
-        "ESET",
-        "Faststartup",
-        "fromaddress",
-        "fullname",
-        "Hudu",
-        "iperf",
-        "LAPSID",
-        "localadmin",
-        "MSITW",
-        "netsh",
-        "procname",
-        "Restartor",
-        "Screenconnect",
-        "Securepoint",
-        "sitename",
-        "smtpserver",
-        "Sophos",
-        "Speedtest",
-        "Splashtop",
-        "SSID",
-        "SUUID",
-        "Teamviewer",
-        "toaddress",
-        "TRMM",
-        "urlmsitw",
-        "warnwhenovermemsize",
-        "Winget"
-    ]
-}
+  "python.defaultInterpreterPath": "env/bin/python",
+  "python.languageServer": "Pylance",
+  "python.analysis.extraPaths": ["env"],
+  "python.testing.pytestEnabled": true,
+  "python.analysis.diagnosticSeverityOverrides": {
+    "reportUnusedImport": "error",
+    "reportDuplicateImport": "error"
+  },
+  "python.analysis.typeCheckingMode": "basic",
+  "python.formatting.provider": "black",
+  "editor.formatOnSave": true,
+  "files.watcherExclude": {
+    "**/.git/objects/**": true,
+    "**/.git/subtree-cache/**": true,
+    "**/node_modules/": true,
+    "/node_modules/**": true,
+    "**/env/": true,
+    "/env/**": true,
+    "**/__pycache__": true,
+    "/__pycache__/**": true,
+    "**/.cache": true,
+    "**/.eggs": true,
+    "**/.ipynb_checkpoints": true,
+    "**/.mypy_cache": true,
+    "**/.pytest_cache": true,
+    "**/*.egg-info": true,
+    "**/*.feather": true,
+    "**/*.parquet*": true,
+    "**/*.pyc": true,
+    "**/*.zip": true
+  },
+  "cSpell.words": [
+    "ADDC",
+    "agentname",
+    "Antispyware",
+    "Antiviruses",
+    "Anynet",
+    "apitw",
+    "Autorun",
+    "bdexe",
+    "bdfb",
+    "bdurl",
+    "Bitdefender",
+    "Bitlocker",
+    "Bluescreen",
+    "BSOD",
+    "Clearand",
+    "clientname",
+    "Cortana",
+    "customidtw",
+    "Debugmode",
+    "DIMM's",
+    "Duplicati",
+    "ESET",
+    "Faststartup",
+    "fromaddress",
+    "fullname",
+    "Hudu",
+    "iperf",
+    "LAPSID",
+    "localadmin",
+    "MSITW",
+    "netsh",
+    "procname",
+    "Restartor",
+    "Screenconnect",
+    "Securepoint",
+    "sitename",
+    "smtpserver",
+    "Sophos",
+    "Speedtest",
+    "Splashtop",
+    "SSID",
+    "SUUID",
+    "Teamviewer",
+    "toaddress",
+    "TRMM",
+    "urlmsitw",
+    "warnwhenovermemsize",
+    "Winget"
+  ]
+}

community_scripts.json

@@ -242,6 +242,18 @@
     ],
     "category": "TRMM (Win):TacticalRMM Related"
   },
+  {
+    "guid": "65a82cdc-1e87-4956-8b43-e1e8a76ebf85",
+    "filename": "Win_TRMM_Troubleshooting_Agent.ps1",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "TacticalRMM - Agent Troubleshooting Script TRMM and Mesh on Windows",
+    "description": "For troubleshooting problems. If TRMM agent is online you can run thru TRMM otherwise you can save as .ps1 file and run manually. It will create a timestamped log file",
+    "shell": "powershell",
+    "supported_platforms": [
+      "windows"
+    ],
+    "category": "TRMM (Win):TacticalRMM Related"
+  },
   {
     "guid": "b90fb6a1-cf53-48d4-9747-60dd333c7159",
     "filename": "Win_TRMM_Mesh_Install.ps1",
@@ -902,9 +914,9 @@
     "guid": "6c78eb04-57ae-43b0-98ed-cbd3ef9e2f80",
     "filename": "Win_Chocolatey_Manage_Apps_Bulk.ps1",
     "submittedBy": "https://github.com/silversword411",
-    "name": "Chocolatey - Install, Uninstall and Upgrade Software",
-    "description": "This script installs, uninstalls and updates software using Chocolatey with logic to slow tasks to minimize hitting community limits. Mode install/uninstall/upgrade Hosts x",
-    "syntax": "-$PackageName <string>\n[-Hosts <string>]\n[-mode {(install) | upgrade | uninstall}]",
+    "name": "Chocolatey - Install, Uninstall, List and Upgrade Software",
+    "description": "This script installs, uninstalls and updates software using Chocolatey with logic to slow tasks to minimize hitting community limits. Mode install/uninstall/upgrade/upgrade-only-installed Hosts x",
+    "syntax": "-PackageName <string>\n[-Hosts <string>]\n[-mode {(install) | upgrade | upgrade-only-installed | uninstall | list}]",
     "shell": "powershell",
     "category": "TRMM (Win):3rd Party Software>Chocolatey",
     "supported_platforms": [
@@ -918,7 +930,7 @@
     "submittedBy": "https://github.com/dinger1986",
     "name": "Winget - Install, Uninstall and Upgrade Software",
     "description": "This script installs, uninstalls and updates software using winget. Mode install/uninstall/upgrade/search",
-    "syntax": "-$PackageName <string>]\n[-mode {install | search | upgrade | uninstall }]",
+    "syntax": "-PackageName <string>]\n[-mode {install | search | upgrade | uninstall }]",
     "shell": "powershell",
     "category": "TRMM (Win):3rd Party Software>WinGet",
     "supported_platforms": [
@@ -1028,6 +1040,20 @@
     ],
     "default_timeout": 30
   },
+  {
+    "guid": "5bc815a0-d349-416f-8c3d-ac499d4da2e8",
+    "filename": "Win_Reboot.ps1",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "Reboot/Restart Computer",
+    "description": "Reboots/Restarts the computer with an optional wait time before restarting.",
+    "syntax": "[-wait <Int>]",
+    "shell": "powershell",
+    "category": "TRMM (Win):Other",
+    "supported_platforms": [
+      "windows"
+    ],
+    "default_timeout": 86400
+  },
   {
     "guid": "f396dae2-c768-45c5-bd6c-176e56ed3614",
     "filename": "Win_Power_RestartorShutdown.ps1",
@@ -1064,11 +1090,11 @@
       "-serviceName {{client.ScreenConnectService}}",
       "-url {{client.ScreenConnectInstaller}}",
       "-clientname {{client.name}}",
-      "-sitename {{site.name}}",
-      "-action {(install) | uninstall | start | stop}"
+      "-sitename {{site.name}}"
     ],
-    "default_timeout": "90",
+    "default_timeout": "120",
     "shell": "powershell",
+    "syntax": "-serviceName <string>\n-url <string>\n-clientname <string>\n-sitename <string>\n-action {(install) | uninstall | start | stop}",
     "supported_platforms": [
       "windows"
     ],

community_scripts.schema.json

@@ -22,6 +22,17 @@
           "type": "string"
         }
       },
+      "env": {
+        "description": "The script environmental variables listed as an array.",
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      },
+      "run_as_user": {
+        "description": "Run this script as the active user as opposed to System (Windows only)",
+        "type": "boolean"
+      },
       "filename": {
         "description": "The filename of the script.",
         "type": "string"

scripts/Win_Antivirus_Verify.ps1

@@ -19,15 +19,16 @@
 
     .NOTES
     Version 1.0 4/7/2021 silversword
-    https://mcpforlife.com/2020/04/14/how-to-resolve-this-state-value-of-av-providers/
-    https://github.com/wortell/PSHelpers/blob/main/src/Public/Add-ProductStates.ps1
-    Call with optional parameter "-antivirusName AntivirusNameHere" in order to check for a specific antivirus
-    antivirusName must match the "displayName" exactly
-    If no antivirusName parameter is specified, the tool returns success if there is any active up to date antivirus on the system
+        https://mcpforlife.com/2020/04/14/how-to-resolve-this-state-value-of-av-providers/
+        https://github.com/wortell/PSHelpers/blob/main/src/Public/Add-ProductStates.ps1
+        Call with optional parameter "-antivirusName AntivirusNameHere" in order to check for a specific antivirus
+        antivirusName must match the "displayName" exactly
+        If no antivirusName parameter is specified, the tool returns success if there is any active up to date antivirus on the system
 	Version 1.1 10/15/2023 dinger1986
-	Added in -customfield to write AV name to a customfield
+        Added in -customfield to write AV name to a customfield
 
-    OS Build must be greater than 14393 to support this script. If it's not it returns exit code 2
+        OS Build must be greater than 14393 to support this script. If it's not it returns exit code 2
+    Version 1.2 7/31/2025 silversword Removing extra text in -customField mode
 #>
 
 param($antivirusName = "*", [switch]$customField)
@@ -58,7 +59,7 @@ param($antivirusName = "*", [switch]$customField)
 function Add-ProductStates {
     [CmdletBinding()]
     param (
-       # This parameter can be passed from pipeline and can contain and array of collections that contain State or productstate members
+        # This parameter can be passed from pipeline and can contain and array of collections that contain State or productstate members
         [Parameter(ValueFromPipeline)]
         [Microsoft.Management.Infrastructure.CimInstance[]]
         $Products,
@@ -120,18 +121,19 @@ if ([environment]::OSVersion.Version.Build -le 14393) {
 
 $return = Get-CimInstance -Namespace root/SecurityCenter2 -className AntivirusProduct | 
 Where-Object { 
-         ($_.displayName -like $antivirusName) -and
-         (($_.productState -band [ProductFlags]::ProductState) -eq [ProductState]::On) -and 
-         (($_.productState -band [ProductFlags]::SignatureStatus) -eq [SignatureStatus]::UpToDate) 
+    ($_.displayName -like $antivirusName) -and
+    (($_.productState -band [ProductFlags]::ProductState) -eq [ProductState]::On) -and 
+    (($_.productState -band [ProductFlags]::SignatureStatus) -eq [SignatureStatus]::UpToDate) 
 } 
 
-Write-Host "Antivirus selection: $antivirusName"
 if ($return) {
     if ($customField) {
         # Only output the name of the first antivirus
         $return[0].displayName
         exit 0
-    } else {
+    }
+    else {
+        Write-Host "Antivirus selection: $antivirusName"
         Write-Host "Antivirus active and up to date"      
         $return
     }

scripts/Win_Bluescreen_Report.ps1

@@ -2,32 +2,43 @@
 .Synopsis
     Bluescreen - Reports bluescreens
 .DESCRIPTION
-    This will check for Bluescreen events on your system. If parameter provided, goes back that number of days
+    This script checks for Bluescreen events on your system. If a parameter is provided, it goes back that number of days to check.
 .EXAMPLE
     365
 .NOTES
     v1 bbrendon 2/2021
-    v1.1 silversword updating with parameters 11/2021    
+    v1.1 silversword updating with parameters 11/2021
+    v1.2 dinger1986 Updated for improved filtering and structure 11/2024
 #>
 
+# Get the parameter (number of days to go back)
+$DaysBack = $args[0]
 
-$param1 = $args[0]
+# Set error handling preference
+$ErrorActionPreference = 'SilentlyContinue'
 
-$ErrorActionPreference = 'silentlycontinue'
+# Determine the time range based on the parameter
 if ($Args.Count -eq 0) {
-    $TimeSpan = (Get-Date) - (New-TimeSpan -Day 1)
-}
-else {
-    $TimeSpan = (Get-Date) - (New-TimeSpan -Day $param1)
+    $StartTime = (Get-Date).AddDays(-1)
+} else {
+    $StartTime = (Get-Date).AddDays(-[int]$DaysBack)
 }
 
+# Retrieve Bluescreen events
+$BlueScreenEvents = Get-WinEvent -FilterHashtable @{
+    LogName      = 'Application';
+    ID           = 1001;
+    ProviderName = 'Windows Error Reporting';
+    Level        = 4;
+    StartTime    = $StartTime
+} | Where-Object { $_.Message -like "*BlueScreen*" }
 
-if (Get-WinEvent -FilterHashtable @{LogName = 'application'; ID = '1001'; ProviderName = 'Windows Error Reporting'; Level = 4; Data = 'BlueScreen'; StartTime = $TimeSpan }) {
-    Write-Output "There has been bluescreen events detected on your system"
-    Get-WinEvent -FilterHashtable @{LogName = 'application'; ID = '1001'; ProviderName = 'Windows Error Reporting'; Level = 4; Data = 'BlueScreen'; StartTime = $TimeSpan }
+# Check and output results
+if ($BlueScreenEvents) {
+    Write-Output "There have been Bluescreen events detected on your system:"
+    $BlueScreenEvents | Format-List TimeCreated, Id, LevelDisplayName, Message
     exit 1
 } else {
-    Write-Output "No bluescreen events detected in the past 24 hours."
+    Write-Output "No Bluescreen events detected in the past $((Get-Date) - $StartTime).Days days."
     exit 0
 }
-

scripts/Win_Chocolatey_List_Installed.bat

@@ -1,3 +1,5 @@
 rem List apps installed by Chocolatey
 
-choco list --local-only
+set "chocoExePath=%PROGRAMDATA%\chocolatey\choco.exe"
+
+"%chocoExePath%" list