File pm-utils-1.3.0-on_ac_power-no-dbus-fallback.diff of Package pm-utils

Overview Repositories Revisions Requests Users Attributes Meta

File pm-utils-1.3.0-on_ac_power-no-dbus-fallback.diff of Package pm-utils (Revision 0959b06fe5c0018cc8344ab67414248b)

Currently displaying revision 0959b06fe5c0018cc8344ab67414248b , Show latest

Index: pm-utils-1.3.0/src/on_ac_power
===================================================================
--- pm-utils-1.3.0.orig/src/on_ac_power	2010-04-01 12:07:44.679844425 +0200
+++ pm-utils-1.3.0/src/on_ac_power	2010-04-01 12:09:45.631532099 +0200
@@ -35,7 +35,7 @@
     --dest=org.freedesktop.UPower \
     /org/freedesktop/UPower \
     org.freedesktop.DBus.Properties.Get \
-    string:org.freedesktop.UPower string:OnBattery)"; then
+    string:org.freedesktop.UPower string:OnBattery 2>/dev/null)"; then
     echo "$s" | grep -q 'boolean false'
     exit $?
 fi
@@ -45,23 +45,34 @@
     --dest=org.freedesktop.DeviceKit.Power \
     /org/freedesktop/DeviceKit/Power \
     org.freedesktop.DBus.Properties.Get \
-    string:org.freedesktop.DeviceKit.Power string:OnBattery)"; then
+    string:org.freedesktop.DeviceKit.Power string:OnBattery 2>/dev/null)"; then
     echo "$s" | grep -q 'boolean false'
     exit $?
 fi
 
 # Check for AC/DC/etc adapters
-ac_adapters="$(hal-find-by-capability --capability ac_adapter)"
+ac_adapters="$(hal-find-by-capability --capability ac_adapter 2>/dev/null)"
+error=$?
 
-# If there are no AC adapters, it is most likely a desktop.
-# Assume online, since we have no data.
-[ -z "$ac_adapters" ] && exit 0
+if [ $error -eq 0 ]; then # dbus and HAL are there
+	# If there are no AC adapters, it is most likely a desktop.
+	# Assume online, since we have no data.
+	[ -z "$ac_adapters" ] && exit 0
 
-# If any of them are online, then we're done.
-for device in $ac_adapters ; do
-	present="$(hal-get-property --udi "$device" --key ac_adapter.present)"
-	[ "$present" = "true" ] && exit 0
-done
+	# If any of them are online, then we're done.
+	for device in $ac_adapters ; do
+		present="$(hal-get-property --udi "$device" --key ac_adapter.present 2>/dev/null)"
+		[ "$present" == "true" ] && exit 0
+	done
+else # fall back to /sys/.../ac/... parsing...
+	ADAP=/sys/bus/acpi/drivers/ac/*/power_supply/*/online
+	for i in $ADAP; do
+		# no adapter -> assume online
+		[ $i = "/sys/bus/acpi/drivers/ac/*/power_supply/*/online" ] && exit 0
+		read a < $i
+		[ $a = 1 ] && exit 0
+	done
+fi
 
 # If there are adapters, but none are online, we're not on AC.
 exit 1

Places

File pm-utils-1.3.0-on_ac_power-no-dbus-fallback.diff of Package pm-utils (Revision 0959b06fe5c0018cc8344ab67414248b)

Places