ADMONE_BLOCK_SEPARATOR="-"
ADMONE_BLOCK_LEFT="["
ADMONE_BLOCK_RIGHT="]"
-ADMONE_INCLUDE="admone-pwd;admone-git;admone-exit-code"
+ADMONE_INCLUDE="admone-pwd;admone-git;admone-exit-code;admone-12hr"
function admone-pwd {
echo "%F{blue}%~%f%F{240}"
function admone-date {
echo $(date -I)
}
-function admone-time {
- echo $(date -Iseconds)
+function admone-12hr {
+ echo $(date +%r)
+}
+function admone-24hr {
+ echo $(date +%x)
}
#######################################################################
lower="%B${ADMONE_PRE_LOWER}%B%F{%(?.cyan.red)}${ADMONE_PROMPT_CHAR}%f%b "
NUM_FUNCS="$(echo $ADMONE_INCLUDE | grep -o ';' | wc -l)"
+ REAL_NUM_FUNCS=$((NUM_FUNCS+1))
+
for (( i = 0; i <= $NUM_FUNCS; i++ )); do
(( val = $i + 1 ))
THE_COMMAND="$(echo $ADMONE_INCLUDE | cut -d ';' -f $val)"
- REAL_NUM_FUNCS=$((NUM_FUNCS+1))
- if [[ $val == $REAL_NUM_FUNCS ]]; then
- upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
- elif [[ $((REAL_NUM_FUNCS%2)) == 0 ]]; then
- if [[ $((val%2)) == 0 ]]; then
- upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT$ADMONE_BLOCK_SEPARATOR"
- else
- upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
- fi
- elif [[ $((REAL_NUM_FUNCS%2)) != 0 ]]; then
- if [[ $val == 1 ]]; then
- upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT$ADMONE_BLOCK_SEPARATOR"
- elif [[ $((val%2)) != 0 ]]; then
- upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT$ADMONE_BLOCK_SEPARATOR"
- else
- upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
- fi
- fi
+ if [[ $val == 1 ]]; then
+ upper+="$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
+ else
+ upper+="$ADMONE_BLOCK_SEPARATOR$ADMONE_BLOCK_LEFT$($THE_COMMAND)$ADMONE_BLOCK_RIGHT"
+ fi
done
[[ -v PS1_NL ]] && echo || PS1_NL=