Fix #138

- Add Zsh version check earlier in the load
mattmc3 · Aug 7, 2023 · 936a877 · 936a877
1 parent 5e0d20b
commit 936a877
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/antidote.zsh b/antidote.zsh
@@ -3,9 +3,15 @@ if test -z "$ZSH_VERSION"; then
   shellname=$(ps -p $$ -oargs= | awk 'NR=1{print $1}')
   echo >&2 "antidote: Expecting zsh. Found '$shellname'."
   return 1
-fi
+else
+  autoload -Uz is-at-least
+  if ! is-at-least 5.4.2; then
+    echo >&2 "antidote: Unsupported Zsh version '$ZSH_VERSION'. Expecting Zsh >5.4.2."
+    return 1
+  fi
 
-typeset -f __antidote_setup &>/dev/null && unfunction __antidote_setup
-0=${(%):-%N}
-autoload -Uz ${0:A:h}/functions/__antidote_setup
-__antidote_setup
+  typeset -f __antidote_setup &>/dev/null && unfunction __antidote_setup
+  0=${(%):-%N}
+  autoload -Uz ${0:A:h}/functions/__antidote_setup
+  __antidote_setup
+fi
diff --git a/functions/__antidote_setup b/functions/__antidote_setup
@@ -2,13 +2,6 @@
 
 ### Setup antidote.
 #function __antidote_setup {
-  # zsh prereq
-  autoload -Uz is-at-least
-  if ! is-at-least 5.4.2; then
-    print >&2 "antidote: Unsupported Zsh version '$ZSH_VERSION'. Expecting Zsh >5.4.2."
-    return 1
-  fi
-
   0=${(%):-%x}
   fpath=( "${0:A:h}" $fpath )
   local fn
@@ -24,6 +17,7 @@
     export MANPATH="${0:A:h:h}/man:$MANPATH"
   fi
 
+  autoload -Uz is-at-least
   if is-at-least 5.8; then
     # the -F option was added in 5.8
     typeset -gHa _adote_zparopt_flags=( -D -M -F )