diff --git a/Scripts/close-calculator.ps1 b/Scripts/close-calculator.ps1 index 508d9e8c..27a93f26 100755 --- a/Scripts/close-calculator.ps1 +++ b/Scripts/close-calculator.ps1 @@ -11,10 +11,9 @@ https://github.com/fleschutz/PowerShell #> -try { - taskkill /im "Calculator.exe" /f /t - exit 0 # success -} catch { - & "$PSScriptRoot/speak-english.ps1" "Sorry, calculator isn't running" +$result = TaskKill /im Calculator.exe /f /t +if ($result -ne 0) { + & "$PSScriptRoot/speak-english.ps1" "Sorry, can't close calculator" exit 1 } +exit 0 # success diff --git a/Scripts/close-git-extensions.ps1 b/Scripts/close-git-extensions.ps1 index c69a95a2..34394ada 100644 --- a/Scripts/close-git-extensions.ps1 +++ b/Scripts/close-git-extensions.ps1 @@ -11,5 +11,9 @@ https://github.com/fleschutz/PowerShell #> -taskkill /im GitExtensions.exe +$result = TaskKill /im GitExtensions.exe +if ($result -ne 0) { + & "$PSScriptRoot/speak-english.ps1" "Sorry, can't close Git Extensions" + exit 1 +} exit 0 # success diff --git a/Scripts/close-microsoft-edge.ps1 b/Scripts/close-microsoft-edge.ps1 index a594baff..edd03362 100755 --- a/Scripts/close-microsoft-edge.ps1 +++ b/Scripts/close-microsoft-edge.ps1 @@ -11,5 +11,9 @@ https://github.com/fleschutz/PowerShell #> -taskkill /im msedge.exe +$result = TaskKill /im msedge.exe +if ($result -ne 0) { + & "$PSScriptRoot/speak-english.ps1" "Sorry, can't close Microsoft Edge" + exit 1 +} exit 0 # success diff --git a/Scripts/close-microsoft-outlook.ps1 b/Scripts/close-microsoft-outlook.ps1 index 7700a6a7..cef118a1 100644 --- a/Scripts/close-microsoft-outlook.ps1 +++ b/Scripts/close-microsoft-outlook.ps1 @@ -11,5 +11,9 @@ https://github.com/fleschutz/PowerShell #> -taskkill /im outlook.exe +$result = TaskKill /im outlook.exe +if ($result -ne 0) { + & "$PSScriptRoot/speak-english.ps1" "Sorry, can't close Microsoft Outlook" + exit 1 +} exit 0 # success diff --git a/Scripts/close-microsoft-paint.ps1 b/Scripts/close-microsoft-paint.ps1 index 1a8a57cb..453d2875 100644 --- a/Scripts/close-microsoft-paint.ps1 +++ b/Scripts/close-microsoft-paint.ps1 @@ -11,5 +11,9 @@ https://github.com/fleschutz/PowerShell #> -taskkill /im mspaint.exe +$result = TaskKill /im mspaint.exe +if ($result -ne 0) { + & "$PSScriptRoot/speak-english.ps1" "Sorry, can't close Microsoft Paint" + exit 1 +} exit 0 # success diff --git a/Scripts/close-microsoft-store.ps1 b/Scripts/close-microsoft-store.ps1 index 8a9d3cfc..e9df96e3 100755 --- a/Scripts/close-microsoft-store.ps1 +++ b/Scripts/close-microsoft-store.ps1 @@ -11,5 +11,9 @@ https://github.com/fleschutz/PowerShell #> -taskkill /im WinStore.App.exe /f /t +$result = TaskKill /im WinStore.App.exe /f /t +if ($result -ne 0) { + & "$PSScriptRoot/speak-english.ps1" "Sorry, can't close Microsoft Store" + exit 1 +} exit 0 # success diff --git a/Scripts/close-mozilla-thunderbird.ps1 b/Scripts/close-mozilla-thunderbird.ps1 index b9ff6f52..75c34bed 100644 --- a/Scripts/close-mozilla-thunderbird.ps1 +++ b/Scripts/close-mozilla-thunderbird.ps1 @@ -11,5 +11,9 @@ https://github.com/fleschutz/PowerShell #> -taskkill /im thunderbird.exe +$result = TaskKill /im thunderbird.exe +if ($result -ne 0) { + & "$PSScriptRoot/speak-english.ps1" "Sorry, can't close Mozilla Thunderbird" + exit 1 +} exit 0 # success diff --git a/Scripts/close-obs-studio.ps1 b/Scripts/close-obs-studio.ps1 index 4e717519..6886deb6 100644 --- a/Scripts/close-obs-studio.ps1 +++ b/Scripts/close-obs-studio.ps1 @@ -11,5 +11,9 @@ https://github.com/fleschutz/PowerShell #> -taskkill /im obs64.exe +$result = TaskKill /im obs64.exe +if ($result -ne 0) { + & "$PSScriptRoot/speak-english.ps1" "Sorry, can't close OBS Studio" + exit 1 +} exit 0 # success diff --git a/Scripts/close-one-calendar.ps1 b/Scripts/close-one-calendar.ps1 index f763a04a..33c6799f 100644 --- a/Scripts/close-one-calendar.ps1 +++ b/Scripts/close-one-calendar.ps1 @@ -11,5 +11,9 @@ https://github.com/fleschutz/PowerShell #> -taskkill /f /im CalendarApp.Gui.Win10.exe +$result = TaskKill /f /im CalendarApp.Gui.Win10.exe +if ($result -ne 0) { + & "$PSScriptRoot/speak-english.ps1" "Sorry, can't close OneCalendar" + exit 1 +} exit 0 # success diff --git a/Scripts/close-paint-three-d.ps1 b/Scripts/close-paint-three-d.ps1 index 6b5eb4e7..7eb785df 100644 --- a/Scripts/close-paint-three-d.ps1 +++ b/Scripts/close-paint-three-d.ps1 @@ -11,5 +11,9 @@ https://github.com/fleschutz/PowerShell #> -taskkill /f /im PaintStudio.View.exe +$result = TaskKill /im PaintStudio.View.exe /f +if ($result -ne 0) { + & "$PSScriptRoot/speak-english.ps1" "Sorry, can't close Paint 3D" + exit 1 +} exit 0 # success diff --git a/Scripts/close-three-d-viewer.ps1 b/Scripts/close-three-d-viewer.ps1 index da460c18..f1e08908 100644 --- a/Scripts/close-three-d-viewer.ps1 +++ b/Scripts/close-three-d-viewer.ps1 @@ -11,5 +11,9 @@ https://github.com/fleschutz/PowerShell #> -taskkill /f /im 3DViewer.exe +$result = TaskKill /im 3DViewer.exe /f +if ($result -ne 0) { + & "$PSScriptRoot/speak-english.ps1" "Sorry, can't close 3D Viewer" + exit 1 +} exit 0 # success diff --git a/Scripts/close-visual-studio.ps1 b/Scripts/close-visual-studio.ps1 index 04046710..c8cdb21d 100644 --- a/Scripts/close-visual-studio.ps1 +++ b/Scripts/close-visual-studio.ps1 @@ -11,5 +11,9 @@ https://github.com/fleschutz/PowerShell #> -taskkill /im devenv.exe +$result = TaskKill /im devenv.exe +if ($result -ne 0) { + & "$PSScriptRoot/speak-english.ps1" "Sorry, can't close Visual Studio" + exit 1 +} exit 0 # success diff --git a/Scripts/export-to-manuals.ps1 b/Scripts/export-to-manuals.ps1 index 45de7ac0..8fc98354 100755 --- a/Scripts/export-to-manuals.ps1 +++ b/Scripts/export-to-manuals.ps1 @@ -24,7 +24,7 @@ try { "⏳ Found $($Scripts.Count) scripts, exporting them to $TargetDir..." foreach ($Script in $Scripts) { - & "$PSScriptRoot/convert-ps2md" "$Script" > "$TargetDir/$($Script.BaseName).md" + & "$PSScriptRoot/convert-ps2md.ps1" "$Script" > "$TargetDir/$($Script.BaseName).md" } [int]$Elapsed = $StopWatch.Elapsed.TotalSeconds