浏览代码

battery: remove redundant grep calls in battery_pct function

Marc Cornellà 4 年之前
父节点
当前提交
3e9e385d98
共有 1 个文件被更改,包括 4 次插入5 次删除
  1. 4 5
      plugins/battery/battery.plugin.zsh

+ 4 - 5
plugins/battery/battery.plugin.zsh

@@ -18,11 +18,10 @@ if [[ "$OSTYPE" = darwin* ]]; then
   }
 
   function battery_pct() {
-    local smart_battery_status="$(ioreg -rc AppleSmartBattery)"
-    local -F maxcapacity=$(command grep '^.*"MaxCapacity"\ =\ ' <<< $smart_battery_status | sed -e 's/^.*"MaxCapacity"\ =\ //')
-    local -F currentcapacity=$(command grep '^.*"CurrentCapacity"\ =\ ' <<< $smart_battery_status | sed -e 's/^.*CurrentCapacity"\ =\ //')
-    local -i pct=$(( (currentcapacity/maxcapacity) * 100 ))
-    echo $pct
+    local battery_status="$(ioreg -rc AppleSmartBattery)"
+    local -i capacity=$(sed -n -e '/MaxCapacity/s/^.*"MaxCapacity"\ =\ //p' <<< $battery_status)
+    local -i current=$(sed -n -e '/CurrentCapacity/s/^.*"CurrentCapacity"\ =\ //p' <<< $battery_status)
+    echo $(( current * 100 / capacity ))
   }
 
   function battery_pct_remaining() {