diff --git a/scripts/battery.sh b/scripts/battery.sh index ee33bdc..25dc32b 100755 --- a/scripts/battery.sh +++ b/scripts/battery.sh @@ -35,7 +35,8 @@ battery_percent() # Check OS case $(uname -s) in Linux) - linux_acpi percent + percent=$(linux_acpi percent) + [ -n "$percent" ] && echo " $percent" ;; Darwin) @@ -74,7 +75,7 @@ battery_status() if [ $status = 'discharging' ] || [ $status = 'Discharging' ]; then echo '' else - echo 'AC ' + echo 'AC' fi } diff --git a/scripts/dracula.sh b/scripts/dracula.sh index ca7f96f..f5aad95 100755 --- a/scripts/dracula.sh +++ b/scripts/dracula.sh @@ -99,17 +99,17 @@ main() powerbg=${gray} if $show_battery; then # battery - tmux set-option -g status-right "#[fg=${pink},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) " + tmux set-option -g status-right "#[fg=${pink},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh)" powerbg=${pink} fi if $show_network; then # network - tmux set-option -ga status-right "#[fg=${cyan},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${cyan}]#($current_dir/network.sh) " + tmux set-option -ga status-right "#[fg=${cyan},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${cyan}] #($current_dir/network.sh)" powerbg=${cyan} fi if $show_weather; then # weather - tmux set-option -ga status-right "#[fg=${orange},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt)" + tmux set-option -ga status-right "#[fg=${orange},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt)" powerbg=${orange} fi diff --git a/scripts/weather.sh b/scripts/weather.sh index cef059b..985af91 100755 --- a/scripts/weather.sh +++ b/scripts/weather.sh @@ -58,7 +58,7 @@ forecast_unicode() display_weather() { if [ $country = 'US' ]; then - echo "$(forecast_unicode)$(get_temp)°" + echo "$(forecast_unicode)$(get_temp)° " else echo '' fi @@ -75,7 +75,7 @@ main() fi # process should be cancelled when session is killed if ping -q -c 1 -W 1 ipinfo.io &>/dev/null; then - echo "$(display_weather) $city, $(get_region_code)" + echo "$(display_weather)$city, $(get_region_code)" else echo "Location Unavailable" fi