From 597f7bed29310bb9546c83315337e1f89a05f7f4 Mon Sep 17 00:00:00 2001 From: Yusuke Uchida Date: Sat, 16 Oct 2021 00:57:10 +0900 Subject: [PATCH] dracula.sh: deleted use_arbitrary_time_format option --- scripts/dracula.sh | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/scripts/dracula.sh b/scripts/dracula.sh index 5e858f2..c93aa94 100755 --- a/scripts/dracula.sh +++ b/scripts/dracula.sh @@ -24,7 +24,6 @@ main() show_border_contrast=$(get_tmux_option "@dracula-border-contrast" false) show_day_month=$(get_tmux_option "@dracula-day-month" false) show_refresh=$(get_tmux_option "@dracula-refresh-rate" 5) - use_arbitrary_time_format=$(get_tmux_option "@dracula-arbitrary-time-format" false) time_format=$(get_tmux_option "@dracula-time-format" "%Y-%m-%d(%a) %H:%M") IFS=' ' read -r -a plugins <<< $(get_tmux_option "@dracula-plugins" "battery network weather") @@ -183,20 +182,19 @@ main() if [ $plugin = "time" ]; then IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-time-colors" "dark_purple white") - case $use_arbitrary_time_format in - false) - 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} " - elif $show_day_month; then # only dd/mm - script="%a %d/%m %I:%M %p ${timezone} " - else - script="%a %m/%d %I:%M %p ${timezone} " - fi;; - true) - script=${time_format};; - esac + if [ -n "$time_format" ]; then + script=${time_format} + else + 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} " + elif $show_day_month; then # only dd/mm + script="%a %d/%m %I:%M %p ${timezone} " + else + script="%a %m/%d %I:%M %p ${timezone} " + fi + fi fi if $show_powerline; then