Formatting and lint fixes on main script

This commit is contained in:
Abhishek Keshri 2022-08-09 06:56:34 +05:30
parent 35888ad255
commit f0c4730ace
No known key found for this signature in database
GPG key ID: 87ABE188E6B98D1C

View file

@ -2,11 +2,10 @@
# setting the locale, some users have issues with different locales, this forces the correct one
export LC_ALL=en_US.UTF-8
current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $current_dir/utils.sh
current_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "$current_dir"/utils.sh
main()
{
main() {
datafile=/tmp/.tmux2k-data
# set configuration option variables
@ -24,14 +23,13 @@ main()
show_border_contrast=$(get_tmux_option "@tmux2k-border-contrast" false)
show_day_month=$(get_tmux_option "@tmux2k-day-month" false)
show_refresh=$(get_tmux_option "@tmux2k-refresh-rate" 5)
IFS=' ' read -r -a plugins <<< $(get_tmux_option "@tmux2k-plugins" "battery network weather")
IFS=' ' read -r -a lefts <<< $(get_tmux_option "@tmux2k-lefts" "cpu-usage ram-usage")
IFS=' ' read -r -a plugins <<<"$(get_tmux_option '@tmux2k-plugins' 'battery network weather')"
IFS=' ' read -r -a lefts <<<"$(get_tmux_option '@tmux2k-lefts' 'cpu-usage ram-usage')"
# tmux2k Color Pallette
white='#f8f8f2'
black='#0a0a0f',
gray='#44475a'
dark_gray='#282a36'
red='#ed001f',
green='#11d116',
yellow='#ffd21a',
@ -41,22 +39,27 @@ main()
orange='#ffb86c'
pink='#ff79c6'
light_purple='#bd93f9'
light_cyan='#8be9fd'
light_green='#50fa7b'
light_red='#ff5555'
light_yellow='#f1fa8c'
dark_purple='#6272a4'
# cyan='#8be9fd'
# green='#50fa7b'
# red='#ff5555'
# yellow='#f1fa8c'
dark_gray='#282a36'
# Handle left icon configuration
case $show_left_icon in
smiley)
left_icon="☺";;
left_icon="☺"
;;
session)
left_icon="#S";;
left_icon="#S"
;;
window)
left_icon="#W";;
left_icon="#W"
;;
*)
left_icon=$show_left_icon;;
left_icon=$show_left_icon
;;
esac
# Handle left icon padding
@ -74,28 +77,32 @@ main()
# start weather script in background
if [[ "${plugins[@]}" =~ "weather" ]]; then
$current_dir/sleep_weather.sh $show_fahrenheit $show_location $fixed_location &
"$current_dir"/sleep_weather.sh "$show_fahrenheit" "$show_location" "$fixed_location" &
fi
# Set timezone unless hidden by configuration
case $show_timezone in
false)
timezone="";;
timezone=""
;;
true)
timezone="#(date +%Z)";;
timezone="#(date +%Z)"
;;
esac
case $show_flags in
false)
flags=""
current_flags="";;
current_flags=""
;;
true)
flags="#{?window_flags,#[fg=${dark_purple}]#{window_flags},}"
current_flags="#{?window_flags,#[fg=${light_purple}]#{window_flags},}"
;;
esac
# sets refresh interval to every 5 seconds
tmux set-option -g status-interval $show_refresh
tmux set-option -g status-interval "$show_refresh"
# set the prefix + t time format
if $show_military; then
@ -132,62 +139,62 @@ main()
for left in "${lefts[@]}"; do
if [ $left = "git" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-git-colors" "green dark_gray")
if [ "$left" = "git" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-git-colors' 'green dark_gray')"
script="#($current_dir/git.sh)"
fi
if [ $left = "battery" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-battery-colors" "pink dark_gray")
if [ "$left" = "battery" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-battery-colors' 'pink dark_gray')"
script="#($current_dir/battery.sh)"
fi
if [ $left = "gpu-usage" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-gpu-usage-colors" "pink dark_gray")
if [ "$left" = "gpu-usage" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-gpu-usage-colors' 'pink dark_gray')"
script="#($current_dir/gpu_usage.sh)"
fi
if [ $left = "cpu-usage" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-cpu-usage-colors" "blue dark_gray")
if [ "$left" = "cpu-usage" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-cpu-usage-colors' 'blue dark_gray')"
script="#($current_dir/cpu_info.sh)"
powerbg=${cyan}
fi
if [ $left = "ram-usage" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-ram-usage-colors" "cyan dark_gray")
if [ "$left" = "ram-usage" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-ram-usage-colors' 'cyan dark_gray')"
script="#($current_dir/ram_info.sh)"
fi
if [ $left = "network" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-network-colors" "cyan dark_gray")
if [ "$left" = "network" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-network-colors' 'cyan dark_gray')"
script="#($current_dir/network.sh)"
fi
if [ $left = "network-bandwidth" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-network-bandwidth-colors" "cyan dark_gray")
if [ "$left" = "network-bandwidth" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-network-bandwidth-colors' 'cyan dark_gray')"
tmux set-option -g status-left 250
script="#($current_dir/network_bandwidth.sh)"
fi
if [ $left = "network-ping" ]; then
IFS=' ' read -r -a colors <<<$(get_tmux_option "@tmux2k-network-ping-colors" "cyan dark_gray")
if [ "$left" = "network-ping" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-network-ping-colors' 'cyan dark_gray')"
script="#($current_dir/network_ping.sh)"
fi
if [ $left = "weather" ]; then
if [ "$left" = "weather" ]; then
# wait unit $datafile exists just to avoid errors
# this should almost never need to wait unless something unexpected occurs
while [ ! -f $datafile ]; do
sleep 0.01
done
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-weather-colors" "orange dark_gray")
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-weather-colors' 'orange dark_gray')"
script="#(cat $datafile)"
fi
if [ $left = "time" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-time-colors" "dark_purple dark_gray")
if $show_day_month && $show_military ; then # military time and dd/mm
if [ "$left" = "time" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-time-colors' 'dark_purple dark_gray')"
if $show_day_month && $show_military; then # military time and dd/mm
script=" %a %d/%m %R ${timezone} "
elif $show_military; then # only military time
script=" %a %m/%d %R ${timezone} "
@ -212,67 +219,66 @@ main()
# Set window list at centre
tmux set -g status-justify centre
# Status right
tmux set-option -g status-right ""
for plugin in "${plugins[@]}"; do
if [ $plugin = "git" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-git-colors" "green dark_gray")
if [ "$plugin" = "git" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-git-colors' 'green dark_gray')"
script="#($current_dir/git.sh)"
fi
if [ $plugin = "battery" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-battery-colors" "pink dark_gray")
if [ "$plugin" = "battery" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-battery-colors' 'pink dark_gray')"
script="#($current_dir/battery.sh)"
fi
if [ $plugin = "gpu-usage" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-gpu-usage-colors" "pink dark_gray")
if [ "$plugin" = "gpu-usage" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-gpu-usage-colors' 'pink dark_gray')"
script="#($current_dir/gpu_usage.sh)"
fi
if [ $plugin = "cpu-usage" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-cpu-usage-colors" "orange dark_gray")
if [ "$plugin" = "cpu-usage" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-cpu-usage-colors' 'orange dark_gray')"
script="#($current_dir/cpu_info.sh)"
fi
if [ $plugin = "ram-usage" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-ram-usage-colors" "cyan dark_gray")
if [ "$plugin" = "ram-usage" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-ram-usage-colors' 'cyan dark_gray')"
script="#($current_dir/ram_info.sh)"
fi
if [ $plugin = "network" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-network-colors" "cyan dark_gray")
if [ "$plugin" = "network" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-network-colors' 'cyan dark_gray')"
script="#($current_dir/network.sh)"
fi
if [ $plugin = "network-bandwidth" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-network-bandwidth-colors" "cyan dark_gray")
if [ "$plugin" = "network-bandwidth" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-network-bandwidth-colors' 'cyan dark_gray')"
tmux set-option -g status-right-length 250
script="#($current_dir/network_bandwidth.sh)"
fi
if [ $plugin = "network-ping" ]; then
IFS=' ' read -r -a colors <<<$(get_tmux_option "@tmux2k-network-ping-colors" "cyan dark_gray")
if [ "$plugin" = "network-ping" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-network-ping-colors' 'cyan dark_gray')"
script="#($current_dir/network_ping.sh)"
fi
if [ $plugin = "weather" ]; then
if [ "$plugin" = "weather" ]; then
# wait unit $datafile exists just to avoid errors
# this should almost never need to wait unless something unexpected occurs
while [ ! -f $datafile ]; do
sleep 0.01
done
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-weather-colors" "orange dark_gray")
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-weather-colors' 'orange dark_gray')"
script="#(cat $datafile)"
fi
if [ $plugin = "time" ]; then
IFS=' ' read -r -a colors <<< $(get_tmux_option "@tmux2k-time-colors" "yellow dark_gray")
if $show_day_month && $show_military ; then # military time and dd/mm
if [ "$plugin" = "time" ]; then
IFS=' ' read -r -a colors <<<"$(get_tmux_option '@tmux2k-time-colors' 'yellow dark_gray')"
if $show_day_month && $show_military; then # military time and dd/mm
script=" %a %d/%m %R ${timezone} "
elif $show_military; then # only military time
script=" %a %m/%d %R "