Merge pull request #241 from jankatins/fix_plugins_dir_setup

pschmitt · web-flow · commit 4c5854b1cd1c · 2022-05-02T08:23:55.000+02:00
fix: Don't error if $OPTS is not yet defined in .zinit-compinit call
diff --git a/zinit-install.zsh b/zinit-install.zsh
@@ -601,7 +601,8 @@ builtin source "${ZINIT[BIN_DIR]}/zinit-side.zsh" || {
 #
 # No arguments.
 .zinit-compinit() {
-    [[ -n ${OPTS[opt_-p,--parallel]} && $1 != 1 ]] && return
+    # This might be called during sourcing when setting up the plugins dir, so check that OPTS is actually existing
+    [[ -n $OPTS && -n ${OPTS[opt_-p,--parallel]} && $1 != 1 ]] && return
 
     emulate -LR zsh
     builtin setopt nullglob extendedglob warncreateglobal typesetsilent

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,8 @@ builtin source "${ZINIT[BIN_DIR]}/zinit-side.zsh" \|\| {`
`601`	`601`	`#`
`602`	`602`	`# No arguments.`
`603`	`603`	`.zinit-compinit() {`
`604`		`- [[ -n ${OPTS[opt_-p,--parallel]} && $1 != 1 ]] && return`
	`604`	`+ # This might be called during sourcing when setting up the plugins dir, so check that OPTS is actually existing`
	`605`	`+ [[ -n $OPTS && -n ${OPTS[opt_-p,--parallel]} && $1 != 1 ]] && return`
`605`	`606`
`606`	`607`	`emulate -LR zsh`
`607`	`608`	`builtin setopt nullglob extendedglob warncreateglobal typesetsilent`