|  | 
| 3 | 3 | export LC_ALL=en_US.UTF-8 | 
| 4 | 4 | 
 | 
| 5 | 5 | current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | 
| 6 |  | -source $current_dir/utils.sh | 
|  | 6 | +source "$current_dir"/utils.sh | 
| 7 | 7 | 
 | 
| 8 | 8 | linux_acpi() { | 
| 9 | 9 |   arg=$1 | 
| 10 | 10 |   BAT=$(ls -d /sys/class/power_supply/*) | 
| 11 | 11 |   if [ ! -x "$(which acpi 2> /dev/null)" ];then | 
| 12 |  | -    for DEV in $BAT; do | 
|  | 12 | +    for DEV in "${BAT[@]}"; do | 
| 13 | 13 |       case "$arg" in | 
| 14 | 14 |         status) | 
| 15 | 15 |           [ -f "$DEV/status" ] && cat "$DEV/status" | 
| @@ -41,15 +41,15 @@ battery_percent() | 
| 41 | 41 |   case $(uname -s) in | 
| 42 | 42 |     Linux) | 
| 43 | 43 |       percent=$(linux_acpi percent) | 
| 44 |  | -      [ -n "$percent" ] && echo "$percent%" | 
|  | 44 | +      [ "$percent" != "" ] && echo "$percent%" | 
| 45 | 45 |       ;; | 
| 46 | 46 | 
 | 
| 47 | 47 |     Darwin) | 
| 48 |  | -      echo $(pmset -g batt | grep -Eo '[0-9]?[0-9]?[0-9]%') | 
|  | 48 | +      echo "$(pmset -g batt | grep -Eo '[0-9]?[0-9]?[0-9]%')" | 
| 49 | 49 |       ;; | 
| 50 | 50 | 
 | 
| 51 | 51 |     FreeBSD) | 
| 52 |  | -      echo $(apm | sed '8,11d' | grep life | awk '{print $4}') | 
|  | 52 | +      echo "$(apm | sed '8,11d' | grep life | awk '{print $4}')" | 
| 53 | 53 |       ;; | 
| 54 | 54 | 
 | 
| 55 | 55 |     CYGWIN*|MINGW32*|MSYS*|MINGW*) | 
| @@ -161,17 +161,17 @@ main() | 
| 161 | 161 |   fi | 
| 162 | 162 | 
 | 
| 163 | 163 |   show_bat_label=$(get_tmux_option "@dracula-show-battery-status" false) | 
| 164 |  | -  if $show_bat_label; then | 
|  | 164 | +  if "$show_bat_label"; then | 
| 165 | 165 |     bat_stat=$(battery_status) | 
| 166 | 166 |   else | 
| 167 | 167 |     bat_stat="" | 
| 168 | 168 |   fi | 
| 169 | 169 | 
 | 
| 170 | 170 |   bat_perc=$(battery_percent) | 
| 171 | 171 | 
 | 
| 172 |  | -  if [ -z "$bat_stat" ]; then # Test if status is empty or not | 
|  | 172 | +  if [ "$bat_stat" = "" ]; then # Test if status is empty or not | 
| 173 | 173 |     echo "$bat_label $bat_perc" | 
| 174 |  | -  elif [ -z "$bat_perc" ]; then # In case it is a desktop with no battery percent, only AC power | 
|  | 174 | +  elif [ "$bat_perc" = "" ]; then # In case it is a desktop with no battery percent, only AC power | 
| 175 | 175 |     echo "$no_bat_label" | 
| 176 | 176 |   else | 
| 177 | 177 |     echo "$bat_label$bat_stat $bat_perc" | 
|  | 
0 commit comments