made far more eficcient

diff --git a/admone.zsh b/admone.zsh
index e6cb23f57aa51d5495878e686c6410c38879a99c..e1fbc64b7cffc58c8297b0e9d0f09875969f090c 100644 (file)
--- a/admone.zsh
+++ b/admone.zsh
@@ -15,7 +15,7 @@ ADMONE_PRE_LOWER="╰ "
 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}"
@@ -31,8 +31,11 @@ function admone-exit-code {
 function admone-date {
   echo $(date -I)
 }
-function admone-time {
-  echo $(date -Iseconds)
+function admone-12hr {
+  echo $(date +%r)
+}
+function admone-24hr {
+  echo $(date +%x)
 }
 #######################################################################
 
@@ -62,28 +65,17 @@ function set-prompt() {
   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=