Skip to content

Commit

Permalink
Fix assignment of variable ZSH
Browse files Browse the repository at this point in the history
* Fix variable ZSH
1. Variable ZSH is not needed by prezto at all.
2. Prezto shouldn't take variable ZSH, or oh-my-zsh.sh from oh-my-zsh will
fail to be loaded.

* Instructions for loading priority
`zgen prezto` should be written after `zgen oh-my-zsh`

Co-authored-by: laggardkernel <[email protected]>

Closes tarjoilija/zgen#114
  • Loading branch information
jandamm committed Sep 19, 2020
1 parent 865852d commit da5fb2e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ It's a good idea to load the base components before specifying any plugins.

This will create a symlink in the `ZSHDOT` or `HOME` directory. This is needed by prezto.

**Note**: When `zgen prezto` is used with `zgen oh-my-zsh` together, `zgen prezto` should be **put behind** the other. Or prompt theme from prezto may not display as expected.

#### Load prezto plugins

zgen prezto <modulename>
Expand Down
6 changes: 1 addition & 5 deletions zgen.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,7 @@ zgen-apply() {
}

-zgen-get-zsh(){
if [[ ${ZGEN_USE_PREZTO} == 1 ]]; then
-zgputs "$(-zgen-get-clone-dir "$ZGEN_PREZTO_REPO" "$ZGEN_PREZTO_BRANCH")"
else
-zgputs "$(-zgen-get-clone-dir "$ZGEN_OH_MY_ZSH_REPO" "$ZGEN_OH_MY_ZSH_BRANCH")"
fi
-zgputs "$(-zgen-get-clone-dir "$ZGEN_OH_MY_ZSH_REPO" "$ZGEN_OH_MY_ZSH_BRANCH")"
}

zgen-load() {
Expand Down

0 comments on commit da5fb2e

Please sign in to comment.