6 Commits

Author SHA1 Message Date
brotoskyj d65ac84d29 Added Kill all Local Cherwell Processes under Tools section
closes #5

Reviewed-on: brotoskyj/CHAMP#7
Co-authored-by: brotoskyj <jbrotosky@gmail.com>
Co-committed-by: brotoskyj <jbrotosky@gmail.com>
2025-01-03 15:23:07 -05:00
brotoskyj 31c24d040e Merge pull request 'Versioning Bug Fix' (#4) from development into master
Reviewed-on: brotoskyj/CHAMP#4
2024-12-31 09:39:21 -05:00
brotoskyj 34c0d0842b Versioning Bug Fix 2024-12-31 09:38:45 -05:00
brotoskyj 4e7b760fc4 Update CHAMP.ps1 2024-12-31 09:21:26 -05:00
brotoskyj 0be48fb9d9 Added State and City to IP Geolocation API 2024-12-31 09:09:50 -05:00
brotoskyj 7af15f39d6 More Features added to Geolocation API 2024-12-31 09:04:45 -05:00
2 changed files with 27 additions and 5 deletions
+26 -4
View File
@@ -102,6 +102,8 @@ $toolStripDropDownButton3 = New-Object System.Windows.Forms.ToolStripDropDownBut
$hscToolStripMenuItem = New-Object System.Windows.Forms.ToolStripMenuItem $hscToolStripMenuItem = New-Object System.Windows.Forms.ToolStripMenuItem
$irtToolStripMenuItem = New-Object System.Windows.Forms.ToolStripMenuItem $irtToolStripMenuItem = New-Object System.Windows.Forms.ToolStripMenuItem
$geolocationToolStripMenuItem = New-Object System.Windows.Forms.ToolStripMenuItem $geolocationToolStripMenuItem = New-Object System.Windows.Forms.ToolStripMenuItem
$sccmLogParserToolStripMenuItem = New-Object System.Windows.Forms.ToolStripMenuItem
$cherwellKillProcessToolStripMenuItem = New-Object System.Windows.Forms.ToolStripMenuItem
$button3 = New-Object System.Windows.Forms.Button $button3 = New-Object System.Windows.Forms.Button
$button4 = New-Object System.Windows.Forms.Button $button4 = New-Object System.Windows.Forms.Button
$button6 = New-Object System.Windows.Forms.Button $button6 = New-Object System.Windows.Forms.Button
@@ -890,6 +892,7 @@ $sunsetToolStripMenuItem.Text = "Sunset"
$toolStripDropDownButton3.BackgroundImageLayout = [System.Windows.Forms.ImageLayout]::None $toolStripDropDownButton3.BackgroundImageLayout = [System.Windows.Forms.ImageLayout]::None
$toolStripDropDownButton3.DisplayStyle = [System.Windows.Forms.ToolStripItemDisplayStyle]::Text $toolStripDropDownButton3.DisplayStyle = [System.Windows.Forms.ToolStripItemDisplayStyle]::Text
$toolStripDropDownButton3.DropDownItems.AddRange(@( $toolStripDropDownButton3.DropDownItems.AddRange(@(
$cherwellKillProcessToolStripMenuItem,
$hscToolStripMenuItem, $hscToolStripMenuItem,
$irtToolStripMenuItem $irtToolStripMenuItem
)) ))
@@ -900,6 +903,17 @@ $toolStripDropDownButton3.Size = New-Object System.Drawing.Size(62, 22)
$toolStripDropDownButton3.Text = "Tools" $toolStripDropDownButton3.Text = "Tools"
$toolStripDropDownButton3.ToolTipText = "Tools" $toolStripDropDownButton3.ToolTipText = "Tools"
# #
# Kill all Cherwell Processes
$cherwellKillProcessToolStripMenuItem.Name = "Kill all Local Cherwell Processes"
$cherwellKillProcessToolStripMenuItem.Size = New-Object System.Drawing.Size(93, 22)
$cherwellKillProcessToolStripMenuItem.Text = "Kill all Local Cherwell Processes"
$cherwellKillProcessToolStripMenuItem.Add_Click(
{
Get-Process | Where-Object {$_.Path -like "*Cherwell*"} | Stop-Process
}
)
#
#
# HSC Pass Check Menu Item # HSC Pass Check Menu Item
# #
$hscToolStripMenuItem.Name = "closeToolStripMenuItem" $hscToolStripMenuItem.Name = "closeToolStripMenuItem"
@@ -914,7 +928,8 @@ $hscToolStripMenuItem.Add_Click(
# #
$irtToolStripMenuItem.BackgroundImageLayout = [System.Windows.Forms.ImageLayout]::None $irtToolStripMenuItem.BackgroundImageLayout = [System.Windows.Forms.ImageLayout]::None
$irtToolStripMenuItem.DropDownItems.AddRange(@( $irtToolStripMenuItem.DropDownItems.AddRange(@(
$geolocationToolStripMenuItem $geolocationToolStripMenuItem,
$sccmLogParserToolStripMenuItem
)) ))
$irtToolStripMenuItem.Name = "themeToolStripMenuItem" $irtToolStripMenuItem.Name = "themeToolStripMenuItem"
$irtToolStripMenuItem.Size = New-Object System.Drawing.Size(180, 22) $irtToolStripMenuItem.Size = New-Object System.Drawing.Size(180, 22)
@@ -930,6 +945,10 @@ $geolocationToolStripMenuItem.Add_Click(
geoLocationForm geoLocationForm
} }
) )
$sccmLogParserToolStripMenuItem.Name = "SCCM Remote Control Viewer Log Parser"
$sccmLogParserToolStripMenuItem.Size = New-Object System.Drawing.Size(180, 22)
$sccmLogParserToolStripMenuItem.Text = "SCCM Remote Control Viewer Log Parser"
$sccmLogParserToolStripMenuItem.Add_Click()
# #
# button3 # button3
# #
@@ -1317,16 +1336,19 @@ $Form1.FormBorderStyle = [System.Windows.Forms.FormBorderStyle]::FixedDialog
$Form1.MaximizeBox = $false $Form1.MaximizeBox = $false
$Form1.Name = "Form1" $Form1.Name = "Form1"
$Form1.StartPosition = [System.Windows.Forms.FormStartPosition]::CenterParent $Form1.StartPosition = [System.Windows.Forms.FormStartPosition]::CenterParent
$Form1.Text = "CHAMP - 20241231" $Form1.Text = "CHAMP - Agile Axolotl"
Function preflight () { Function preflight () {
Write-Host "CHAMP - Agile Axolotl Update" -ForegroundColor "Yellow" -BackgroundColor "Black"
Write-Host ""
Write-Host ""
$preflightCounter = [int] 0 $preflightCounter = [int] 0
$preflightDependancies = "" $preflightDependancies = ""
Write-Host "Running Pre-Flight checks...`n" Write-Host "Running Pre-Flight checks...`n"
$currentVersion = "20241231" $currentVersion = "20250103"
$version = Invoke-WebRequest -URI https://git.racooncity.org/brotoskyj/CHAMP/raw/branch/master/version.txt | Select-Object -ExpandProperty Content $version = Invoke-WebRequest -URI https://git.racooncity.org/brotoskyj/CHAMP/raw/branch/master/version.txt | Select-Object -ExpandProperty Content
Write-Host "Version Check:" Write-Host "Version Check:"
Write-Host "Local Version: $currentVersion" Write-Host "Local Version: $currentVersion"
if ( $version -gt $currentVersion ) { if ( [int]$version -gt $currentVersion ) {
Write-Host "Latest Version $version" Write-Host "Latest Version $version"
Write-Host -ForegroundColor "Red" "[ ] Up to Date`n" Write-Host -ForegroundColor "Red" "[ ] Up to Date`n"
$preflightDependancies = "Newer Version Available`n" + $preflightDependancies $preflightDependancies = "Newer Version Available`n" + $preflightDependancies
+1 -1
View File
@@ -1 +1 @@
20241231 20250103