Fix quoting for zsh 5.0.0 - thanks @psprint

Author: Jonathan Dahan

changelog.md

@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Accidental export of local `fun` variable
+- extra "'" in separator for geometry_hg
+- Quoting for zsh 5.0.0 - thanks @psprint
 
 ## 2.0.2 - 2019-09-04
 

functions/geometry_git.zsh

@@ -41,12 +41,12 @@ geometry_git_rebase() {
 geometry_git_remote() {
   local unpushed=${GEOMETRY_GIT_SYMBOL_UNPUSHED:-"⇡"}
   local unpulled=${GEOMETRY_GIT_SYMBOL_UNPULLED:-"⇣"}
-  local local_commit && local_commit=$(git rev-parse "@" 2>/dev/null)
-  local remote_commit && remote_commit=$(git rev-parse "@{u}" 2>/dev/null)
+  local local_commit && local_commit="$(git rev-parse "@" 2>/dev/null)"
+  local remote_commit && remote_commit="$(git rev-parse "@{u}" 2>/dev/null)"
 
   [[ $local_commit == "@" || $local_commit == $remote_commit ]] && return
 
-  local common_base && common_base=$(git merge-base "@" "@{u}" 2>/dev/null) # last common commit
+  local common_base && common_base="$(git merge-base "@" "@{u}" 2>/dev/null)" # last common commit
   [[ $common_base == $remote_commit ]] && echo $unpushed && return
   [[ $common_base == $local_commit ]]  && echo $unpulled && return
 

functions/geometry_hg.zsh

@@ -4,11 +4,11 @@ geometry_hg() {
   (( $+commands[hg] )) || return 1
   [[ -d .hg ]] || return 2
 
-  local branch="$(ansi ${GEOMETRY_HG_COLOR_BRANCH:=242} $(hg branch 2> /dev/null))"
+  local branch="$(ansi ${GEOMETRY_HG_COLOR_BRANCH:=242} "$(hg branch 2> /dev/null)")"
 
   [[ -n "$(hg status 2> /dev/null)" ]] \
-    && local symbol=$(ansi ${GEOMETRY_HG_COLOR_DIRTY:=red} ${GEOMETRY_HG_SYMBOL_DIRTY:="⬡"}) \
-    || local symbol=$(ansi ${GEOMETRY_HG_COLOR_CLEAN:=green} ${GEOMETRY_HG_SYMBOL_CLEAN:="⬢"})
+    && local symbol="$(ansi ${GEOMETRY_HG_COLOR_DIRTY:=red} ${GEOMETRY_HG_SYMBOL_DIRTY:="⬡"})" \
+    || local symbol="$(ansi ${GEOMETRY_HG_COLOR_CLEAN:=green} ${GEOMETRY_HG_SYMBOL_CLEAN:="⬢"})"
 
-  echo -n "${branch}${GEOMETRY_HG_SYMBOL_SEPARATOR:='::'}${symbol}"
+  echo -n "${branch}${GEOMETRY_HG_SYMBOL_SEPARATOR:=::}${symbol}"
 }

functions/geometry_kube.zsh

@@ -4,7 +4,7 @@ geometry_kube_symbol() {
 }
 
 geometry_kube_namespace() {
-  local kube_namespace=$(kubectl config view --minify --output "jsonpath={..namespace}" 2> /dev/null)
+  local kube_namespace="$(kubectl config view --minify --output "jsonpath={..namespace}" 2> /dev/null)"
   ansi ${GEOMETRY_KUBE_NAMESPACE_COLOR:=default} ${kube_namespace:=default}
 }
 

functions/geometry_npm_package_version.zsh

@@ -7,9 +7,9 @@ geometry_npm_package_version() {
     : ${GEOMETRY_NPM_PACKAGE_VERSION_SYMBOL_COLOR:=red}
     : ${GEOMETRY_NPM_PACKAGE_VERSION_COLOR:=red}
 
-  	local npm_package_version=$(\grep version package.json | \grep --color=never -oE '[0-9]+\.[0-9]+\.[0-9]')
+  	local npm_package_version="$(\grep version package.json | \grep --color=never -oE '[0-9]+\.[0-9]+\.[0-9]')"
 
-    local symbol=$(ansi $GEOMETRY_NPM_PACKAGE_VERSION_SYMBOL_COLOR $GEOMETRY_NPM_PACKAGE_SYMBOL)
-    local version=$(ansi $GEOMETRY_NPM_PACKAGE_VERSION_COLOR v$npm_package_version)
+    local symbol="$(ansi $GEOMETRY_NPM_PACKAGE_VERSION_SYMBOL_COLOR $GEOMETRY_NPM_PACKAGE_SYMBOL)"
+    local version="$(ansi $GEOMETRY_NPM_PACKAGE_VERSION_COLOR v$npm_package_version)"
     echo -n $symbol $version
 }

functions/geometry_rust_version.zsh

@@ -3,7 +3,7 @@
 geometry_rust_version() {
     { test -f Cargo.toml || ls -1 '*rs' 2>/dev/null; } || return 1
 
-  	local rust_version=$(rustc --version | \grep --color=never -oE '[0-9]+\.[0-9]+\.[0-9]')
+  	local rust_version="$(rustc --version | \grep --color=never -oE '[0-9]+\.[0-9]+\.[0-9]')"
 
     ansi ${GEOMETRY_RUST_VERSION_COLOR:=red} v$rust_version
 }

functions/geometry_status.zsh

@@ -16,9 +16,9 @@ geometry_status() {
         colors=(${GEOMETRY_STATUS_SYMBOL_COLOR_HASH_COLORS})
       fi
 
-      local sum=0; for c in ${(s::)^HOST}; do ((sum += $(print -f '%d' "'$c"))); done
+      local sum=0; for c in ${(s::)^HOST}; do ((sum += "$(print -f '%d' "'$c")")); done
 
-      local index=$(($sum % ${#colors}))
+      local index="$(($sum % ${#colors}))"
 
       [[ "$index" -eq 0 ]] && index=1