From 219ea40fe99d3b64d32532ef826cb6c2ce12feac Mon Sep 17 00:00:00 2001
From: Luke Smith <luke@lukesmith.xyz>
Date: Mon, 15 Feb 2021 10:53:41 -0500
Subject: [PATCH] multibattery functionality returned close #899

---
 .local/bin/statusbar/sb-battery | 15 ++++++---------
 FUNDING.yml                     |  3 +--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.local/bin/statusbar/sb-battery b/.local/bin/statusbar/sb-battery
index d0272ec..382b31b 100755
--- a/.local/bin/statusbar/sb-battery
+++ b/.local/bin/statusbar/sb-battery
@@ -16,15 +16,12 @@ case $BLOCK_BUTTON in
 	6) "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac
 
-# Check if battery directories are detected
-[ ! -e /sys/class/power_supply/BAT?* ] && echo "No battery found" && exit 1
-
 # Loop through all attached batteries and format the info
-for battery in /sys/class/power_supply/BAT?*
-do
+for battery in /sys/class/power_supply/BAT?*; do
+	# If non-first battery, print a space separator.
+	[ -n "${capacity+x}" ] && printf " "
 	# Sets up the status and capacity
-	status=$(cat "$battery/status")
-	case "$status" in
+	case "$(cat "$battery/status")" in
 		"Full") status="⚡" ;;
 		"Discharging") status="🔋" ;;
 		"Charging") status="🔌" ;;
@@ -35,5 +32,5 @@ do
 	# Will make a warn variable if discharging and low
 	[ "$status" = "🔋" ] && [ "$capacity" -le 25 ] && warn="❗"
 	# Prints the info
-	printf "%s%s%d%%\n" "$status" "$warn" "$capacity"; unset warn
-done && return 0
+	printf "%s%s%d%%" "$status" "$warn" "$capacity"; unset warn
+done && exit 0
diff --git a/FUNDING.yml b/FUNDING.yml
index f8e6076..ec61a8b 100644
--- a/FUNDING.yml
+++ b/FUNDING.yml
@@ -1,3 +1,2 @@
+custom: ["https://lukesmith.xyz/donate.html", "https://lukesmith.xyz/crypto.html"]
 github: lukesmithxyz
-custom: ["https://lukesmith.xyz/donate", "https://paypal.me/lukemsmith", "https://lukesmith.xyz/crypto"]
-patreon: lukesmith