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:19b15e9aea6e6338946e373a134885a4d359b345
Branches Tags
xinb:master
...
compare: xinb:d7dd01043ac333d7a8e6355259aa17d22654e90e
Branches Tags
xinb:master

4 Commits
19b15e9aea ... d7dd01043a

Author SHA1 Message Date
Thomas Boyer d7dd01043a
Merge 01e06b931a into cae2e45193 2025-01-10 14:39:00 +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
Thomas Boyer 01e06b931a feat(direnv): warn user if direnv not found 
Instead of silently not installing the shell hooks, issue a warning (then keep doing nothing).
 2024-12-10 15:20:44 +01:00
3 changed files with 7 additions and 3 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

7
plugins/direnv/direnv.plugin.zsh
View File

@ -1,5 +1,8 @@
# Don't continue if direnv is not found # If direnv is not found, don't continue and print a warning
command -v direnv &>/dev/null || return if ! command -v direnv &>/dev/null; then
echo "Warning: direnv not found. Please install direnv and ensure it's in your PATH before using this plugin."
return
fi
_direnv_hook() { _direnv_hook() {
trap -- '' SIGINT; trap -- '' SIGINT;

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