From 5c34a983fe4f807da428d4d4bcf589db4dd2cf8a Mon Sep 17 00:00:00 2001
From: Markus Fleschutz <markus.fleschutz@gmail.com>
Date: Sat, 14 Sep 2024 14:29:28 +0200
Subject: [PATCH] Updated check-power.ps1 and check-swap-space.ps1

---
 scripts/check-power.ps1      | 22 +++++++++++-----------
 scripts/check-swap-space.ps1 |  8 ++++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/scripts/check-power.ps1 b/scripts/check-power.ps1
index 0a0256d7..08a200f5 100755
--- a/scripts/check-power.ps1
+++ b/scripts/check-power.ps1
@@ -5,7 +5,7 @@
 	This PowerShell script queries the power status and prints it.
 .EXAMPLE
 	PS> ./check-power.ps1
-	⚠️ Battery at 9% with power scheme 'HP Optimized' - 54min remaining
+	⚠️ Battery 9% only with 54min remaining (power scheme is 'HP Optimized') 
 .LINK
 	https://github.com/fleschutz/PowerShell
 .NOTES
@@ -27,25 +27,25 @@ try {
 			if ($details.BatteryChargeStatus -eq "NoSystemBattery") {
 				$reply = "✅ AC powered"
 			} elseif ($percent -ge 95) {
-				$reply = "✅ Battery nearly full ($percent%, power scheme '$powerScheme')"
+				$reply = "✅ Battery nearly full ($percent%, power scheme is '$powerScheme')"
 			} else {
-				$reply = "✅ Battery charging ($percent%, power scheme '$powerScheme')"
+				$reply = "✅ Battery charging ($percent%, power scheme is '$powerScheme')"
 			}
 		} else { # must be offline
 			if (($remaining -eq 0) -and ($percent -ge 60)) {
-				$reply = "✅ Battery $percent% full (power scheme '$powerScheme')"
+				$reply = "✅ Battery $percent% full (power scheme is '$powerScheme')"
 			} elseif ($remaining -eq 0) {
-				$reply = "✅ Battery at $percent% (power scheme '$powerScheme')"
+				$reply = "✅ Battery at $percent% (power scheme is '$powerScheme')"
 			} elseif ($remaining -le 5) {
-				$reply = "⚠️ Battery at $percent% (power scheme '$powerScheme') - ONLY $($remaining)min remaining"
+				$reply = "⚠️ Battery $percent% ONLY $($remaining)min remaining (power scheme is '$powerScheme')"
 			} elseif ($remaining -le 30) {
-				$reply = "⚠️ Battery at $percent% (power scheme '$powerScheme') - only $($remaining)min remaining"
+				$reply = "⚠️ Battery $percent% only $($remaining)min remaining (power scheme is '$powerScheme')"
 			} elseif ($percent -lt 10) {
-				$reply = "⚠️ Battery at $percent% (power scheme '$powerScheme') - $($remaining)min remaining"
-			} elseif ($percent -ge 80) {
-				$reply = "✅ Battery $percent% full (power scheme '$powerScheme') - $($remaining)min remaining"
+				$reply = "⚠️ Battery $percent% only with $($remaining)min remaining (power scheme is '$powerScheme') "
+			} elseif ($percent -ge 90) {
+				$reply = "✅ Battery $percent% full with $($remaining)min remaining (power scheme is '$powerScheme')"
 			} else {
-				$reply = "✅ Battery at $percent% (power scheme '$powerScheme') - $($remaining)min remaining"
+				$reply = "✅ Battery $percent% with $($remaining)min remaining (power scheme is '$powerScheme') "
 			}
 		}
 	}
diff --git a/scripts/check-swap-space.ps1 b/scripts/check-swap-space.ps1
index 7815be55..67098785 100755
--- a/scripts/check-swap-space.ps1
+++ b/scripts/check-swap-space.ps1
@@ -48,14 +48,14 @@ try {
 	if ($total -eq 0) {
         	Write-Output "⚠️ No swap space configured"
 	} elseif ($free -eq 0) {
-		Write-Output "⚠️ Swap space is FULL ($(MB2String $total))"
+		Write-Output "⚠️ Swap space is full ($(MB2String $total))"
 	} elseif ($free -lt $minLevel) {
-		Write-Output "⚠️ Swap space has only $(MB2String $free) of $(MB2String $total) free"
+		Write-Output "⚠️ Swap space has only $(MB2String $free) of $(MB2String $total) left"
 	} elseif ($used -lt 3) {
 		Write-Output "✅ Swap space unused - $(MB2String $free) available"
 	} else {
-		[int64]$percent = ($used * 100) / $total
-		Write-Output "✅ Swap space at $percent% of $(MB2String $total) - $(MB2String $free) free"
+		[int64]$percent = ($free * 100) / $total
+		Write-Output "✅ Swap space has $(MB2String $free) of $(MB2String $total) left ($percent%)"
 	}
 	exit 0 # success
 } catch {