Move loose code

[admone.git] / admone.zsh

diff --git a/admone.zsh b/admone.zsh
index 7f01fd4f5ff7e97d5c0fe8727a3b321a5843dd4d..8f13a010b526453a85590dcfa7eae7bdeff6811f 100644 (file)
--- a/admone.zsh
+++ b/admone.zsh
@@ -80,25 +80,21 @@ function zle-keymap-select zle-line-init zle-line-finish {
   zle -R
 }
 
-NUM_FUNCS="$(echo $INCLUDE | grep -o ';' | wc -l)"
-THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f 1)"
-[[ -v PS1_NL ]] && echo || PS1_NL=
-
 set-twoline-prompt() {
   # Reset prompts
   upper="${PRE_UPPER}"
   lower="${PRE_LOWER}${FORMAT_LOWER}${PROMPT_CHAR}%f%b "
 
   # Add in functions as defined above
-  upper+="$BLOCK_LEFT$($THE_COMMAND)$BLOCK_RIGHT"
+  upper+="${BLOCK_LEFT}$($THE_COMMAND)${BLOCK_RIGHT}"
 
   for (( i = 0; i < $NUM_FUNCS; i++ )); do
     THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f $(($i + 2)))"
-    upper+="$BLOCK_SEPARATOR$BLOCK_LEFT$($THE_COMMAND)$BLOCK_RIGHT"
+    upper+="${BLOCK_SEPARATOR}${BLOCK_LEFT}$(${THE_COMMAND})${BLOCK_RIGHT}"
   done
 
   # Add line above
-  PROMPT=$upper$'\n'$lower
+  PROMPT=${upper}$'\n'${lower}
 }
 
 set-oneline-prompt() {
@@ -107,16 +103,22 @@ set-oneline-prompt() {
 
   for (( i = 0; i <= $NUM_FUNCS; i++ )); do
     THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f $(($i + 1)))"
-    RPROMPT+="$BLOCK_LEFT$($THE_COMMAND)$BLOCK_RIGHT"
+    RPROMPT+="${BLOCK_LEFT}$($THE_COMMAND)${BLOCK_RIGHT}"
   done
 }
+
 # Set everything!
 set-prompt() {
+  NUM_FUNCS="$(echo $INCLUDE | grep -o ';' | wc -l)"
+  THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f 1)"
+
   if [[ $TWO_LINE == "1" ]]; then
     set-twoline-prompt
   else
     set-oneline-prompt
   fi
+
+  [[ -v PS1_NL ]] && echo || PS1_NL=
 }
 
 if [[ ! $(echo $INCLUDE | grep -q "vcs") ]]; then