From 3caf0d7df64f4b9bf55e3babc2563e0f47a91199 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Wed, 10 Apr 2024 11:16:17 +0200 Subject: [PATCH] Update and fix bugs --- cbattery | 9 +++++++-- cbattery.plist | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cbattery b/cbattery index dad14d3..847bf5e 100755 --- a/cbattery +++ b/cbattery @@ -4,6 +4,7 @@ set -e CACHE_FILE="${XDG_CACHE_HOME:-$HOME/.cache}/cbattery.status" SHARE_DIR=/usr/local/share/cbattery +PATH="/usr/bin:/usr/local/bin:/usr/sbin:/opt/homebrew/bin:/opt/homebrew/sbin:/opt/homebrew:$PATH" usage() { cat << EOF @@ -39,7 +40,6 @@ enable_charging() { echo "Enabling battery charging" sudo smc -k CH0B -w 00 sudo smc -k CH0C -w 00 - disable_discharging } disable_charging() { @@ -78,7 +78,12 @@ install_visudo_file() { install_launch_daemon() { launch_daemon=/Library/LaunchDaemons/cbattery.plist - sudo cp "$SHARE_DIR"/cbattery.plist "$launch_daemon" + script_dir="$(dirname "$(realpath "$0")")" + share_plist="$SHARE_DIR/cbattery.plist" + if ! grep -q "$script_dir" "$share_plist"; then + sed "s:/usr/local/bin:$script_dir:g" "$share_plist" | sudo tee "$share_plist" > /dev/null + fi + sudo cp "$share_plist" "$launch_daemon" sudo chown root:wheel "$launch_daemon" sudo launchctl load "$launch_daemon" } diff --git a/cbattery.plist b/cbattery.plist index f05a793..451c85f 100644 --- a/cbattery.plist +++ b/cbattery.plist @@ -10,9 +10,15 @@ ProgramArguments - /opt/homebrew/bin/cbattery + /opt/homebrew/bin/cbattery charging off + + StandardOutPath + /tmp/cbattery.stdout + StandardErrorPath + /tmp/cbattery.stderr +