Read before writing smc

This reverts commit 4ced07c359.

.visudo

@@ -1,7 +1,7 @@
-Cmnd_Alias      BATTERYOFF = /usr/local/bin/smc -k CH0B -w 02, /usr/local/bin/smc -k CH0C -w 02, /usr/local/bin/smc -k CH0B -r, /usr/local/bin/smc -k CH0C -r
+Cmnd_Alias      BATTERYOFF = smc -k CH0B -w 02, smc -k CH0C -w 02, smc -k CH0B -r, smc -k CH0C -r
-Cmnd_Alias      BATTERYON = /usr/local/bin/smc -k CH0B -w 00, /usr/local/bin/smc -k CH0C -w 00
+Cmnd_Alias      BATTERYON = smc -k CH0B -w 00, smc -k CH0C -w 00
-Cmnd_Alias      DISCHARGEOFF = /usr/local/bin/smc -k CH0I -w 00, /usr/local/bin/smc -k CH0I -r
+Cmnd_Alias      DISCHARGEOFF = smc -k CH0I -w 00, smc -k CH0I -r
-Cmnd_Alias      DISCHARGEON = /usr/local/bin/smc -k CH0I -w 01
+Cmnd_Alias      DISCHARGEON = smc -k CH0I -w 01
 
 ALL ALL = NOPASSWD: BATTERYOFF
 ALL ALL = NOPASSWD: BATTERYON

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024  Santiago Lo Coco
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -1,20 +1,39 @@
 PREFIX ?= /usr/local
 DESTDIR = $(PREFIX)/bin
 INSTALL_PATH = $(DESTDIR)/cbattery
+SHAREDIR = $(PREFIX)/share/cbattery
+DAEMON_PATH = $(SHAREDIR)/cbattery.plist
+VISUDO_PATH = $(SHAREDIR)/.visudo
 
 all: install
 
-install: $(INSTALL_PATH)
+install: $(INSTALL_PATH) $(DAEMON_PATH) $(VISUDO_PATH)
 
 $(INSTALL_PATH): cbattery
 	@echo "Installing cbattery to $(DESTDIR)"
 	@install -d $(DESTDIR)
 	@install -m 755 $< $(DESTDIR)
 
+$(DAEMON_PATH): cbattery.plist
+	@echo "Installing cbattery.plist to $(DAEMON_PATH)"
+	@install -d $(SHAREDIR)
+	@install -m 644 $< $(DAEMON_PATH)
+
+$(VISUDO_PATH): .visudo
+	@echo "Installing .visudo to $(VISUDO_PATH)"
+	@install -d $(SHAREDIR)
+	@install -m 644 $< $(VISUDO_PATH)
+
 uninstall:
 	@echo "Removing cbattery from $(DESTDIR)"
 	@$(DESTDIR)/cbattery revert || (echo "Reverting cbattery configurations failed"; exit 1)
 	@rm -f $(INSTALL_PATH)
+	@echo "Removing cbattery.plist from $(DAEMON_PATH)"
+	@rm -f $(DAEMON_PATH)
+	@echo "Removing .visudo from $(VISUDO_PATH)"
+	@rm -f $(VISUDO_PATH)
+	@echo "Removing $(SHAREDIR)"
+	@rmdir $(SHAREDIR) || true
 
 help:
 	@echo "Available targets:"

cbattery

@@ -2,114 +2,163 @@
 
 set -e
 
-function usage() {
+TMP_FILE=/tmp/cbattery.status
-	cat << EOF
+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
 usage: ${0##*/} [command]
-	charging [on|off]	- Toggle charging
+
-	adapter [on|off]	- Toggle adapter connection
+    charging [on|off]		- Toggle charging
-	status			- Get status information
+    adapter [on|off]		- Toggle adapter connection
-	revert			- Revert to default settings
+    status			- Get status information
-	visudo			- Run the script without password
+    revert			- Revert to default settings
-	help			- Display this help message
+    visudo			- Run the script without password
+    help			- Display this help message
 EOF
 }
 
-function enable_discharging() {
+write_cache() {
-	echo "Enabling battery discharging"
+    [[ -n "$NO_CACHE" ]] || echo "$1" > "$TMP_FILE"
-	sudo smc -k CH0I -w 01
 }
 
-function disable_discharging() {
+read_cache() {
-	echo "Disabling battery discharging"
+    cat "$TMP_FILE" 2> /dev/null
-	sudo smc -k CH0I -w 00
 }
 
-function enable_charging() {
+log_message() {
-	echo "Enabling battery charging"
+    timestamp=$(date "+%b %d %H:%M:%S")
-	sudo smc -k CH0B -w 00
+    echo "$timestamp - $1"
-	sudo smc -k CH0C -w 00
-	disable_discharging
 }
 
-function disable_charging() {
+enable_discharging() {
-	echo "Disabling battery charging"
+    log_message "Enabling battery discharging"
-	sudo smc -k CH0B -w 02
+    sudo smc -k CH0I -w 01
-	sudo smc -k CH0C -w 02
 }
 
-function get_smc_charging_hex() {
+disable_discharging() {
-	smc -k CH0B -r | awk '{print $4}' | sed 's:\)::'
+    log_message "Disabling battery discharging"
+    sudo smc -k CH0I -w 00
 }
 
-function get_smc_charging_status() {
+enable_charging() {
-	hex_status=$(get_smc_charging_hex)
+    [[ "$(get_smc_charging_hex)" == "00" ]] && return
-	if [[ "$hex_status" == "00" ]]; then
+    log_message "Enabling battery charging"
-		echo "enabled"
+    sudo smc -k CH0B -w 00
-	else
+    sudo smc -k CH0C -w 00
-		echo "disabled"
-	fi
 }
 
-function get_battery_percentage() {
+disable_charging() {
-	battery_percentage=$(pmset -g batt | tail -n1 | awk '{print $3}' | sed 's:%\;::')
+    [[ "$(get_smc_charging_hex)" != "00" ]] && return
-	echo "$battery_percentage"
+    log_message "Disabling battery charging"
+    sudo smc -k CH0B -w 02
+    sudo smc -k CH0C -w 02
 }
 
-function install_visudo_file() {
+get_smc_charging_hex() {
-	sudoers_file=/private/etc/sudoers.d/cbattery
+    smc -k CH0B -r | awk '{print $4}' | sed s:\)::
-	sudo cp "$1" "$sudoers_file"
-	sudo chmod 440 "$sudoers_file"
 }
 
-action=$1
+get_smc_charging_status() {
-setting=$2
+    hex_status=$(get_smc_charging_hex)
+    [[ "$hex_status" == "00" ]] && echo "enabled" || echo "disabled"
+}
 
-if [ -z "$action" ] || [[ "$action" == "help" ]]; then
+get_battery_percentage() {
-	usage
+    pmset -g batt | awk 'END {print $3}' | sed 's/%;//'
-	exit 0
+}
-fi
 
-if [[ "$action" == "revert" ]]; then
+install_visudo_file() {
-	enable_charging
+    sudoers_file="/private/etc/sudoers.d/cbattery"
-	disable_discharging
+    if ! smc_loc="$(command -v smc)"; then
-	exit 0
+	echo "'smc' is required but not found."
-fi
+	exit 1
+    fi
+    sed "s:smc:$smc_loc:g" "$SHARE_DIR/.visudo" | sudo tee "$sudoers_file" > /dev/null
+    if ! sudo visudo -c -f "$sudoers_file"; then
+	echo "Failed to check sudoers file syntax."
+	sudo rm "$sudoers_file"
+	exit 1
+    fi
+    sudo chmod 440 "$sudoers_file"
+}
 
-if [[ "$action" == "charging" ]]; then
+install_launch_daemon() {
-	echo "Setting $action to $setting"
+    launch_daemon=/Library/LaunchDaemons/cbattery.plist
-	if [[ "$setting" == "on" ]]; then
+    script_dir="$(dirname "$(realpath "$0")")"
-		enable_charging
+    share_plist="$SHARE_DIR/cbattery.plist"
-	elif [[ "$setting" == "off" ]]; then
+    if ! grep -q "$script_dir" "$share_plist"; then
-		disable_charging
+	sed "s:/usr/local/bin:$script_dir:g" "$share_plist" | sudo tee "$share_plist" > /dev/null
-	fi
+    fi
-	exit 0
+    sudo cp "$share_plist" "$launch_daemon"
-fi
+    sudo chown root:wheel "$launch_daemon"
+    sudo launchctl load -w "$launch_daemon"
+}
 
-if [[ "$action" == "adapter" ]]; then
+get_cached_status() {
-	echo "Setting $action to $setting"
+    set +e
-	if [[ "$setting" == "on" ]]; then
+    read_cache_result=$(read_cache)
-		enable_discharging
+    read_cache_error=$?
-	elif [[ "$setting" == "off" ]]; then
+    set -e
-		disable_discharging
+    if [ $read_cache_error -ne 0 ]; then
-	fi
+        status=$(get_smc_charging_status)
-	exit 0
+        write_cache "$status"
-fi
+        echo "$status"
+    else
+        echo "$read_cache_result"
+    fi
+}
 
-if [[ "$action" == "status" ]]; then
+runScript() {
-	if [[ "$setting" == "charging" ]]; then
+    action=$1
-		exit "$(get_smc_charging_hex)"
+    setting=$2
-	else
-		echo "Battery at $(get_battery_percentage)%, smc charging $(get_smc_charging_status)"
-	fi
-	exit 0
-fi
 
-if [[ "$action" == "visudo" ]]; then
+    case "$action" in
-	if [[ -n "$setting" ]]; then
+        "help" | "")
-		install_visudo "$setting"
+            usage
-	else
+            ;;
-		install_visudo ".visudo"
+        "revert")
-	fi
+            enable_charging
-	exit 0
+            disable_discharging
-fi
+	    launch_daemon=/Library/LaunchDaemons/cbattery.plist
+	    [[ -f "$launch_daemon" ]] && sudo launchctl unload -w "$launch_daemon"
+            ;;
+        "charging")
+            log_message "Setting $action to $setting"
+            case "$setting" in
+                "on") enable_charging && write_cache "enabled" ;;
+                "off") disable_charging && write_cache "disabled" ;;
+                *) echo "Invalid option: $setting" ;;
+            esac
+            ;;
+        "adapter")
+            log_message "Setting $action to $setting"
+            case "$setting" in
+                "on") enable_discharging ;;
+                "off") disable_discharging ;;
+                *) echo "Invalid option: $setting" ;;
+            esac
+            ;;
+        "status")
+            case "$setting" in
+                "charging") exit "$(get_smc_charging_hex)" ;;
+                "cache") get_cached_status ;;
+                *) echo "Battery at $(get_battery_percentage)%, smc charging $(get_smc_charging_status)" ;;
+            esac
+            ;;
+        "visudo")
+            install_visudo_file
+            ;;
+	"daemon")
+	    install_launch_daemon
+	    ;;
+        *)
+            echo "Invalid command: $action"
+            usage
+            ;;
+    esac
+}
+
+runScript "$@"
 

cbattery.plist

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>cbattery</string>
+
+    <key>RunAtLoad</key>
+    <true/>
+
+    <key>ProgramArguments</key>
+    <array>
+	<string>/usr/local/bin/cbattery</string>
+        <string>charging</string>
+        <string>off</string>
+    </array>
+
+    <key>StandardOutPath</key>
+    <string>/tmp/cbattery.stdout</string>
+    <key>StandardErrorPath</key>
+    <string>/tmp/cbattery.stderr</string>
+
+    <key>EnvironmentVariables</key>
+    <dict>
+       <key>NO_CACHE</key>
+       <string>true</string>
+    </dict>
+</dict>
+</plist>