fix geometry_status and geometry_exitcode

Author: jedahan

Diff for: functions/geometry_exitcode

@@ -1,3 +1,3 @@
 # geometry_exitcode - show the exit code of the last status
 
-(( $GEOMETRY[LAST_STATUS] )) && ansi ${GEOMETRY_EXITCODE_COLOR:-red} $GEOMETRY[LAST_STATUS] || echo ''
+(( $GEOMETRY_STATUS )) && ansi ${GEOMETRY_EXITCODE_COLOR:-red} $GEOMETRY_STATUS

Diff for: functions/geometry_status

@@ -1,16 +1,13 @@
 # geometry_status - show a symbol with error/success and root/non-root information
 
-local root; [[ $UID = 0 || $EUID = 0 ]] && root=true || root=false
-local error; (( $GEOMETRY[LAST_STATUS] )) && error=true || error=false
+(( $GEOMETRY_STATUS )) && error=true || error=false
+[[ $UID = 0 || $EUID = 0 ]] && root=true || root=false
 
-local color=${GEOMETRY_STATUS_COLOR:-default}
+( $error ) && color=${GEOMETRY_STATUS_COLOR_ERROR:-red} || color=${GEOMETRY_STATUS_COLOR:-default}
 
-if ( $error );
-then
-  color=${GEOMETRY_STATUS_COLOR_ERROR:-red};
-fi
+( ! $root && ! $error ) && symbol=${GEOMETRY_STATUS_SYMBOL:-▲}
+( ! $root && $error ) && symbol=${GEOMETRY_STATUS_SYMBOL_ERROR:-△}
+( $root && ! $error ) && symbol=${GEOMETRY_STATUS_SYMBOL_ROOT:-▼}
+( $root && $error ) && symbol=${GEOMETRY_STATUS_SYMBOL_ROOT_ERROR:=▽}
 
-( $root && $error ) && ansi $color ${GEOMETRY_STATUS_SYMBOL_ROOT_ERROR:=▽} && return
-( $root ) && ansi $color ${GEOMETRY_STATUS_SYMBOL_ROOT:-▼} && return
-( $error ) && ansi $color ${GEOMETRY_STATUS_SYMBOL_ERROR:-△} && return
-ansi $color ${GEOMETRY_STATUS_SYMBOL:-▲}
+ansi $color $symbol

Diff for: geometry.zsh

@@ -4,7 +4,7 @@
 # pure: https://github.com/sindresorhus/pure
 # mnml: https://github.com/subnixr/minimal
 
-builtin typeset -gA GEOMETRY; GEOMETRY[ROOT]=${0:A:h}
+builtin typeset -gA GEOMETRY
 
 (($+GEOMETRY_PROMPT)) || GEOMETRY_PROMPT=(geometry_echo geometry_status geometry_path)
 (($+GEOMETRY_RPROMPT)) || GEOMETRY_RPROMPT=(geometry_git geometry_hg geometry_jj geometry_echo)
@@ -14,7 +14,7 @@ builtin typeset -gA GEOMETRY; GEOMETRY[ROOT]=${0:A:h}
 
 builtin autoload -U add-zsh-hook
 
-fpath+=("${GEOMETRY[ROOT]}"/functions)
+fpath+=("${0:A:h}"/functions)
 autoload -Uz \
   geometry_last_command \
   geometry_docker_machine \
@@ -130,8 +130,7 @@ geometry::rprompt() {
 }
 
 geometry::prompt() {
-  PROMPT=""
-  GEOMETRY[LAST_STATUS]="$status"
+  export GEOMETRY_STATUS=$status
   PROMPT=" $(geometry::wrap $PWD $GEOMETRY_PROMPT) "
 }