From 4bee6dc93db4ca411ac267431c9777cbc72eb60f Mon Sep 17 00:00:00 2001 From: Dean Fenster Date: Sat, 3 Dec 2016 19:46:25 +0200 Subject: [PATCH 1/3] Fixed an issue where full battery registers as disconnected --- powerlevel9k.zsh-theme | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index c06d1286..8ada453d 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -397,11 +397,12 @@ prompt_battery() { # Return if no battery found [[ -z $bat ]] && return - - [[ $(cat $bat/capacity) -gt 100 ]] && local bat_percent=100 || local bat_percent=$(cat $bat/capacity) - [[ $(cat $bat/status) =~ Charging ]] && local connected=true - [[ $(cat $bat/status) =~ Charging && $bat_percent =~ 100 ]] && current_state="charged" - [[ $(cat $bat/status) =~ Charging && $bat_percent -lt 100 ]] && current_state="charging" + local capacity=$(cat $bat/capacity) + local battery_status=$(cat $bat/status) + [[ $capacity -gt 100 ]] && local bat_percent=100 || local bat_percent=$capacity + [[ $battery_status =~ Charging || $battery_status =~ Full ]] && local connected=true + [[ $connected && $bat_percent =~ 100 ]] && current_state="charged" + [[ $connected && $bat_percent -lt 100 ]] && current_state="charging" if [[ -z $connected ]]; then [[ $bat_percent -lt $POWERLEVEL9K_BATTERY_LOW_THRESHOLD ]] && current_state="low" || current_state="disconnected" fi From a637321d58935d4dc4ee25e97c7a2ee02f7c8387 Mon Sep 17 00:00:00 2001 From: Dean Fenster Date: Sat, 3 Dec 2016 20:02:52 +0200 Subject: [PATCH 2/3] Fixed syntax issue --- powerlevel9k.zsh-theme | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 8ada453d..c21d0b43 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -401,10 +401,11 @@ prompt_battery() { local battery_status=$(cat $bat/status) [[ $capacity -gt 100 ]] && local bat_percent=100 || local bat_percent=$capacity [[ $battery_status =~ Charging || $battery_status =~ Full ]] && local connected=true - [[ $connected && $bat_percent =~ 100 ]] && current_state="charged" - [[ $connected && $bat_percent -lt 100 ]] && current_state="charging" if [[ -z $connected ]]; then [[ $bat_percent -lt $POWERLEVEL9K_BATTERY_LOW_THRESHOLD ]] && current_state="low" || current_state="disconnected" + else + [[ $bat_percent =~ 100 ]] && current_state="charged" + [[ $bat_percent -lt 100 ]] && current_state="charging" fi if [[ -f /usr/bin/acpi ]]; then local time_remaining=$(acpi | awk '{ print $5 }') From b37090073c5ad491d7f70803e7f06168471b3148 Mon Sep 17 00:00:00 2001 From: Dean Fenster Date: Thu, 8 Dec 2016 21:06:07 +0200 Subject: [PATCH 3/3] Supressed error message for invalid acpi date (happens when disconnecting the power cable) --- powerlevel9k.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index c21d0b43..d56e46f4 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -412,7 +412,7 @@ prompt_battery() { if [[ $time_remaining =~ rate ]]; then local tstring="..." elif [[ $time_remaining =~ "[:digit:]+" ]]; then - local tstring=${(f)$(date -u -d "$(echo $time_remaining)" +%k:%M)} + local tstring=${(f)$(date -u -d "$(echo $time_remaining)" +%k:%M 2> /dev/null)} fi fi [[ -n $tstring ]] && local remain=" ($tstring)"