xinb
/
ohmyzsh
mirror of https://github.com/ohmyzsh/ohmyzsh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: xinb:6ff6e2b9af7df7894c744dc4acba8753dd162846
Branches Tags
xinb:master
...
compare: xinb:99ab8c3bb8903158a136ae3613633c288107a350
Branches Tags
xinb:master

4 Commits
6ff6e2b9af ... 99ab8c3bb8

Author SHA1 Message Date
Johann Rohwer 99ab8c3bb8
Merge 2babe619a3 into cae2e45193 2025-01-10 17:50:24 +01:00
Thomas cae2e45193
fix(rust): call `rustc` through `rustup run` (#12901) 2025-01-10 14:17:49 +01:00
Carlo Sala 276e540eed
fix(cli): ensure `ksharrays` is unset 
Closes #12900
 2025-01-10 14:11:33 +01:00
JM Rohwer 2babe619a3 feat(virtualenvwrapper): disable lazy script and force full script with environment variable 2021-08-16 14:47:21 +02:00
3 changed files with 9 additions and 4 deletions
Show Stats Expand all files Collapse all files

1
lib/cli.zsh
View File

@ -1,6 +1,7 @@
#!/usr/bin/env zsh #!/usr/bin/env zsh
function omz { function omz {
setopt localoptions noksharrays
[[ $# -gt 0 ]] || { [[ $# -gt 0 ]] || {
_omz::help _omz::help
return 1 return 1

2
plugins/rust/rust.plugin.zsh
View File

@ -22,5 +22,5 @@ fi
rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &| rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &|
cat >| "$ZSH_CACHE_DIR/completions/_cargo" <<'EOF' cat >| "$ZSH_CACHE_DIR/completions/_cargo" <<'EOF'
#compdef cargo #compdef cargo
source "$(rustc +${${(z)$(rustup default)}[1]} --print sysroot)"/share/zsh/site-functions/_cargo source "$(rustup run ${${(z)$(rustup default)}[1]} rustc --print sysroot)"/share/zsh/site-functions/_cargo
EOF EOF

10
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View File

@ -8,10 +8,14 @@ function {
/usr/share/bash-completion/completions/virtualenvwrapper \ /usr/share/bash-completion/completions/virtualenvwrapper \
$HOME/.local/bin/virtualenvwrapper.sh $HOME/.local/bin/virtualenvwrapper.sh
do do
if [[ -f "$virtualenvwrapper" ]]; then if [[ -f "$virtualenvwrapper" ]]; then
source "$virtualenvwrapper" if [[ $VIRTUALENVWRAPPER_NO_LAZY -eq 1 ]] && [[ $(echo $virtualenvwrapper | grep lazy) ]]; then
return true
else
source "$virtualenvwrapper"
return
fi fi
fi
done done
print "[oh-my-zsh] virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh.\n"\ print "[oh-my-zsh] virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh.\n"\
"Please install with \`pip install virtualenvwrapper\`" >&2 "Please install with \`pip install virtualenvwrapper\`" >&2