Merge pull request #155 from mattmc3/v1.9.2

v1.9.2
mattmc3 · Sep 22, 2023 · 16e88d9 · 16e88d9
2 parents 0e21ff3 + 7a74b0b
commit 16e88d9
Show file tree

Hide file tree

Showing 26 changed files with 33 additions and 40 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.9.1
+current_version = 1.9.2
 parse = v?(?P<major>\d+)\.(?P<minor>\d+)\.(?P<revision>\d+)
 serialize = {major}.{minor}.{revision}
 

diff --git a/README.md b/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.1-df5e88)
+![version](https://img.shields.io/badge/version-v1.9.2-df5e88)
 
 <a title="GetAntidote"
    href="https://getantidote.github.io"

diff --git a/functions/__antidote_bulk_clone b/functions/__antidote_bulk_clone
@@ -2,7 +2,7 @@
 
 ### Generate background clone commands
 #function __antidote_bulk_clone {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
 
   # get a list of clonable repos from a bundle file
   awk '

diff --git a/functions/__antidote_bundle_dir b/functions/__antidote_bundle_dir
@@ -2,7 +2,7 @@
 
 ### Get the name of the bundle dir.
 #function __antidote_bundle_dir {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
 
   # If the bundle is a repo/URL, then by default we use the legacy antibody format:
   # `$ANTIDOTE_HOME/https-COLON--SLASH--SLASH-github.com-SLASH-zsh-users-SLASH-zsh-autosuggestions`

diff --git a/functions/__antidote_bundle_name b/functions/__antidote_bundle_name
@@ -2,7 +2,7 @@
 
 ### Get the short name of the bundle.
 #function __antidote_bundle_name {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
   local MATCH MBEGIN MEND; local -a match mbegin mend  # appease 'warn_create_global'
   local bundle=$1
   local bundle_type="$(__antidote_bundle_type $bundle)"

diff --git a/functions/__antidote_bundle_type b/functions/__antidote_bundle_type
@@ -12,7 +12,7 @@
 ### - url     - a git repo (URL format)
 ### - word    - a word
 #function __antidote_bundle_type {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
   local bundle=$1
 
   # Try to expand path bundles with '$' and '~' prefixes so that we get a more

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

diff --git a/functions/__antidote_get_cachedir b/functions/__antidote_get_cachedir
@@ -2,21 +2,24 @@
 
 ### Get the default cache directory per OS
 #function __antidote_get_cachedir {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
 
   local result
   if [[ "${OSTYPE}" == darwin* ]]; then
     result=$HOME/Library/Caches
   elif [[ "${OSTYPE}" == (cygwin|msys)* ]]; then
     result=${LOCALAPPDATA:-$LocalAppData}
+    if type cygpath > /dev/null; then
+      result=$(cygpath "$result")
+    fi
   elif [[ -n "$XDG_CACHE_HOME" ]]; then
     result=$XDG_CACHE_HOME
   else
     result=$HOME/.cache
   fi
 
   if [[ -n "$1" ]]; then
-    if [[ $result == *\\* ]]; then
+    if [[ $result == *\\* ]] && [[ $result != */* ]]; then
       result+="\\$1"
     else
       result+="/$1"

diff --git a/functions/__antidote_initfiles b/functions/__antidote_initfiles
@@ -2,7 +2,7 @@
 
 ### Get the path to a plugin's init file.
 #function __antidote_initfiles {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
   typeset -ga reply=()
   local dir=${1:A}
   local initfiles=($dir/${dir:A:t}.plugin.zsh(N))

diff --git a/functions/__antidote_parse_bundles b/functions/__antidote_parse_bundles
@@ -2,7 +2,7 @@
 
 ### Parse antidote's bundle DSL.
 #function __antidote_parse_bundles {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
   awk '
     BEGIN { RS="[\r\n]" }
 

diff --git a/functions/__antidote_tourl b/functions/__antidote_tourl
@@ -2,7 +2,7 @@
 
 ### Get the url from a repo bundle.
 #function __antidote_tourl {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
 
   local bundle=$1
   local url=$bundle

diff --git a/functions/__antidote_usage b/functions/__antidote_usage
@@ -2,7 +2,7 @@
 
 ### Print usage.
 #function __antidote_usage {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
   cat<<EOS
 antidote - the cure to slow zsh plugin management
 

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

diff --git a/functions/antidote-bundle b/functions/antidote-bundle
@@ -8,7 +8,7 @@
 ### Clone bundle(s) and generate the static load script.
 #function antidote-bundle {
   # Download a bundle and prints its Zsh source line.
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
 
   local o_help
   zparseopts $_adote_zparopt_flags -- h=o_help -help=h || return 1

diff --git a/functions/antidote-help b/functions/antidote-help
@@ -7,7 +7,7 @@
 #
 
 #function antidote-help {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
 
   local o_help
   zparseopts $_adote_zparopt_flags -- h=o_help -help=h || return 1

diff --git a/functions/antidote-home b/functions/antidote-home
@@ -7,7 +7,7 @@
 # Can be overridden by setting `$ANTIDOTE_HOME`.
 #
 #function antidote-home {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
 
   typeset -g REPLY=
   local o_help

diff --git a/functions/antidote-install b/functions/antidote-install
@@ -7,7 +7,7 @@
 #                         [--pre <func>] [--post <func>]
 #                         [-a|--autoload <path>] <bundle> [<bundlefile>]
 #function antidote-install {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
 
   local -A flag_to_annotation=(
     '-a' autoload

diff --git a/functions/antidote-list b/functions/antidote-list
@@ -5,7 +5,7 @@
 # usage: antidote list [-h|--help] [-s|--short] [-d|--dirs] [-u|--url]
 #
 #function antidote-list {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
 
   local o_help o_short o_url o_dirs
   zparseopts $_adote_zparopt_flags -- \
@@ -27,9 +27,10 @@
 
   local bundledir
   local output=()
-  local bundles=($(antidote-home)/**/.git/..(/N))
+  local bundles=($(antidote-home)/**/.git(/N))
 
-  for bundledir in ${bundles:A}; do
+  for bundledir in $bundles; do
+    bundledir=${bundledir:h}
     local url=$(git -C "$bundledir" config remote.origin.url)
     if (( $#o_dirs )); then
       output+=($bundledir)

diff --git a/functions/antidote-path b/functions/antidote-path
@@ -5,7 +5,7 @@
 # usage: antidote path [-h|--help] <bundle>
 #
 #function antidote-path {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
 
   local o_help
   zparseopts $_adote_zparopt_flags -- h=o_help -help=h || return 1

diff --git a/functions/antidote-purge b/functions/antidote-purge
@@ -6,7 +6,7 @@
 #        antidote purge [-a|--all]
 #
 #function antidote-purge {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
 
   local o_help o_all
   zparseopts $_adote_zparopt_flags -- \

diff --git a/functions/antidote-script b/functions/antidote-script
@@ -14,7 +14,7 @@
 
 ### Generate the Zsh script to load a plugin.
 #function antidote-script {
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
   local MATCH MBEGIN MEND; local -a match mbegin mend  # appease 'warn_create_global'
   local REPLY=
 

diff --git a/functions/antidote-update b/functions/antidote-update
@@ -6,7 +6,7 @@
 #
 #function antidote-update {
   0=${(%):-%x}
-  emulate -L zsh; setopt $_adote_funcopts
+  emulate -L zsh; setopt local_options $_adote_funcopts
 
   local o_help o_self o_bundles
   zparseopts $_adote_zparopt_flags -- \

diff --git a/tests/README.md b/tests/README.md
@@ -58,7 +58,7 @@ The `-v/--version` flag displays the current version:
 
 ```zsh
 % antidote --version
-antidote version 1.9.1
+antidote version 1.9.2
 %
 ```
 

diff --git a/tests/test_antidote.md b/tests/test_antidote.md
@@ -78,7 +78,7 @@ No arg exit status is 2:
 
 ```zsh
 % antidote --version
-antidote version 1.9.1
+antidote version 1.9.2
 % antidote -v >/dev/null; echo $?
 0
 % antidote --version >/dev/null; echo $?

diff --git a/tests/test_cmd_update.md b/tests/test_cmd_update.md
@@ -22,7 +22,7 @@ Bundle updates complete.
 Updating antidote...
 Antidote self-update complete.
 
-antidote version 1.9.1
+antidote version 1.9.2
 %
 ```