Merge pull request #159 from mattmc3/v1.9.3

v1.9.3

Author: mattmc3

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.9.2
+current_version = 1.9.3
 parse = v?(?P<major>\d+)\.(?P<minor>\d+)\.(?P<revision>\d+)
 serialize = {major}.{minor}.{revision}
 

README.md

@@ -1,7 +1,7 @@
 # antidote
 
 [![MIT License](https://img.shields.io/badge/license-MIT-007EC7.svg)](/LICENSE)
-![version](https://img.shields.io/badge/version-v1.9.2-df5e88)
+![version](https://img.shields.io/badge/version-v1.9.3-df5e88)
 
 <a title="GetAntidote"
    href="https://getantidote.github.io"
@@ -57,7 +57,7 @@ You can install the latest release of antidote by cloning it with `git`:
 
 ```zsh
 # first, run this from an interactive zsh terminal session:
-git clone --depth=1 https://github.com/mattmc3/antidote.git ${ZDOTDIR:-~}/.antidote
+git clone --depth=1 https://github.com/mattmc3/antidote.git ${ZDOTDIR:-$HOME}/.antidote
 ```
 
 ### Install with a package manager

antidote

@@ -9,7 +9,9 @@
 #
 function antidote {
   0=${(%):-%x}
-  (( $+functions[antidote-main] )) || source ${0:A:h}/antidote.zsh
+  if ! typeset -f antidote-main > /dev/null; then
+    source ${0:A:h}/antidote.zsh
+  fi
   antidote-main "$@"
 }
 antidote "$@"

functions/__antidote_bulk_clone

@@ -5,7 +5,7 @@
   emulate -L zsh; setopt local_options $_adote_funcopts
 
   # get a list of clonable repos from a bundle file
-  awk '
+  $__adote_awkcmd '
     BEGIN { RS="[\r\n]" }
 
     # initialize vars

functions/__antidote_filter_defers

@@ -3,7 +3,7 @@
 ### Filter all but the first defer block.
 #function __antidote_filter_defers {
   emulate -L zsh; setopt local_options $_adote_funcopts
-  awk '
+  $__adote_awkcmd '
     # filter all but the first time we source zsh-defer (a 4 line if statement)
     BEGIN   { skip=0; found=0 }
     skip>0  { skip-- }

functions/__antidote_parse_bundles

@@ -3,7 +3,7 @@
 ### Parse antidote's bundle DSL.
 #function __antidote_parse_bundles {
   emulate -L zsh; setopt local_options $_adote_funcopts
-  awk '
+  $__adote_awkcmd '
     BEGIN { RS="[\r\n]" }
 
     # skip comments and empty lines

functions/__antidote_setup

@@ -6,8 +6,11 @@
   fpath=( "${0:A:h}" $fpath )
   local fn
   for fn in ${0:A:h}/*; do
-    [[ $fn:t != '__antidote_setup' ]] || continue
-    (( $+functions[${fn:t}] )) && unfunction ${fn:t}
+    [[ ${fn:t} != '__antidote_setup' ]] || continue
+    if typeset -f ${fn:t} > /dev/null; then
+      unfunction ${fn:t}
+    fi
+
     # autoload extensionless function files
     [[ -z "${fn:e}" ]] && autoload -Uz "${fn}"
   done
@@ -29,4 +32,8 @@
   if zstyle -t ':antidote:tests' set-warn-options; then
     typeset -gHa _adote_funcopts=( $_adote_funcopts warn_create_global warn_nested_var )
   fi
+
+  gawk --version &>/dev/null && typeset -gH __adote_awkcmd=gawk || typeset -gH __adote_awkcmd=awk
+  typeset -gHi __adote_ksh_arrays
+  typeset -gHi __adote_sh_glob
 #}

functions/__antidote_version

@@ -4,7 +4,7 @@
 #function __antidote_version {
   emulate -L zsh; setopt local_options $_adote_funcopts
   0=${(%):-%x}
-  local ver='1.9.2'
+  local ver='1.9.3'
   local gitsha=$(git -C "${0:A:h:h}" rev-parse --short HEAD 2>/dev/null)
   [[ -z "$gitsha" ]] || ver="$ver ($gitsha)"
   print "antidote version $ver"

functions/_antidote

@@ -3,7 +3,7 @@
 function _antidote_subcommands {
   local usage=$(
     antidote --help |
-    awk '
+    $__adote_awkcmd '
       BEGIN{OFS=":"; p=0}
       /^commands:$/ {p=1; next}
       !p{next}

functions/antidote

@@ -9,6 +9,8 @@
 #
 #function antidote {
   0=${(%):-%x}
-  (( $+functions[antidote-main] )) || source ${0:A:h:h}/antidote.zsh
+  if ! typeset -f antidote-main > /dev/null; then
+    source ${0:A:h:h}/antidote.zsh
+  fi
   antidote-main "$@"
 #}