From d830c75431c6d7e834bffe902ebd4fd66651519f Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Thu, 29 Sep 2022 19:26:46 +0900 Subject: [PATCH] lib/history (HIST_STAMPS): do not enclose within [...] by default --- lib/history.sh | 10 ++++++---- templates/bashrc.osh-template | 14 ++++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/history.sh b/lib/history.sh index ecbdad7..90a4c96 100644 --- a/lib/history.sh +++ b/lib/history.sh @@ -53,8 +53,10 @@ bind '"\e[D": backward-char' # Show history case $HIST_STAMPS in - "mm/dd/yyyy") HISTTIMEFORMAT=$'\033[31m[%m/%d/%Y] \033[36m[%T]\033[0m ' ;; - "dd.mm.yyyy") HISTTIMEFORMAT=$'\033[31m[%d.%m.%Y] \033[36m[%T]\033[0m ' ;; - "yyyy-mm-dd") HISTTIMEFORMAT=$'\033[31m[%F] \033[36m[%T]\033[0m ' ;; - *) HISTTIMEFORMAT=$'\033[31m%F \033[36m%T\033[0m ' ;; + "[mm/dd/yyyy]") HISTTIMEFORMAT=$'\033[31m[%m/%d/%Y] \033[36m[%T]\033[0m ' ;; + "[dd.mm.yyyy]") HISTTIMEFORMAT=$'\033[31m[%d.%m.%Y] \033[36m[%T]\033[0m ' ;; + "[yyyy-mm-dd]") HISTTIMEFORMAT=$'\033[31m[%F] \033[36m[%T]\033[0m ' ;; + "mm/dd/yyyy") HISTTIMEFORMAT='%m/%d/%Y %T ' ;; + "dd.mm.yyyy") HISTTIMEFORMAT='%d.%m.%Y %T ' ;; + "yyyy-mm-dd"|*) HISTTIMEFORMAT='%F %T ' ;; esac diff --git a/templates/bashrc.osh-template b/templates/bashrc.osh-template index c960ae8..7cdef11 100644 --- a/templates/bashrc.osh-template +++ b/templates/bashrc.osh-template @@ -42,10 +42,16 @@ OSH_THEME="font" # DISABLE_UNTRACKED_FILES_DIRTY="true" # Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# IF not set, default value is: yyyy-mm-dd -# HIST_STAMPS="yyyy-mm-dd" +# stamp shown in the history command output. One of the following values can +# be used to specify the timestamp format. +# * 'mm/dd/yyyy' # mm/dd/yyyy + time +# * 'dd.mm.yyyy' # dd.mm.yyyy + time +# * 'yyyy-mm-dd' # yyyy-mm-dd + time +# * '[mm/dd/yyyy]' # [mm/dd/yyyy] + [time] with colors +# * '[dd.mm.yyyy]' # [dd.mm.yyyy] + [time] with colors +# * '[yyyy-mm-dd]' # [yyyy-mm-dd] + [time] with colors +# If not set, the default value is 'yyyy-mm-dd'. +# HIST_STAMPS='yyyy-mm-dd' # Uncomment the following line if you do not want OMB to overwrite the existing # aliases by the default OMB aliases defined in lib/*.sh