summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2014-01-10 02:50:52 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-01-10 02:50:53 +0000
commitf77ef2edb097280d39b420655bcc465bfb73de3c (patch)
tree04286247ef05e980095dfd3c05ee467c3ddb3dda
parente695338e21080d3cbe20935db572e4cd0c7a620c (diff)
parent719757d6a8670660c3c7d2490457ff7064241422 (diff)
downloadgit-repo-f77ef2edb097280d39b420655bcc465bfb73de3c.tar.gz
Merge "hooks/pre-auto-gc: fix AC detection on OSX Maverick"
-rwxr-xr-xhooks/pre-auto-gc2
1 files changed, 1 insertions, 1 deletions
diff --git a/hooks/pre-auto-gc b/hooks/pre-auto-gc
index 360e5e1f..43403022 100755
--- a/hooks/pre-auto-gc
+++ b/hooks/pre-auto-gc
@@ -35,7 +35,7 @@ elif grep -q "AC Power \+: 1" /proc/pmu/info 2>/dev/null
35then 35then
36 exit 0 36 exit 0
37elif test -x /usr/bin/pmset && /usr/bin/pmset -g batt | 37elif test -x /usr/bin/pmset && /usr/bin/pmset -g batt |
38 grep -q "Currently drawing from 'AC Power'" 38 grep -q "drawing from 'AC Power'"
39then 39then
40 exit 0 40 exit 0
41elif test -d /sys/bus/acpi/drivers/battery && test 0 = \ 41elif test -d /sys/bus/acpi/drivers/battery && test 0 = \