Merge branch 'master' of github.com:robbyrussell/oh-my-zsh

This commit is contained in:
Robby Russell 2012-12-02 13:11:02 -08:00
commit 5193a1dbc9

View File

@ -8,7 +8,7 @@
# Modified to add support for Apple Mac # # Modified to add support for Apple Mac #
########################################### ###########################################
if [[ $(uname) -eq "Darwin" ]] ; then if [[ $(uname) == "Darwin" ]] ; then
function battery_pct_remaining() { function battery_pct_remaining() {
if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
@ -46,7 +46,7 @@ if [[ $(uname) -eq "Darwin" ]] ; then
fi fi
} }
elif [[ $(uname) -eq "Linux" ]] ; then elif [[ $(uname) == "Linux" ]] ; then
if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" } function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" }