config/zsh
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Compare commits

base: config:83b24c67d1428472b84066b53e41c7cef703ea7f
Branches Tags
config:main config:generic-git-prompt config:osc-52-paste config:zcurses/build-dir
...
compare: config:512e535ff518cce8e00c0c829fd0e1cdf31d57e3
Branches Tags
config:main config:generic-git-prompt config:osc-52-paste config:zcurses/build-dir

2 Commits
83b24c67d1 ... 512e535ff5

Author SHA1 Message Date
Kenneth Benzie (Benie)
512e535ff5 Clear args before source in autoenv 2026-06-17 13:50:42 +01:00
Kenneth Benzie (Benie)
42b97f8ac9 Also copy in worktree add/sycn local.bazelrc if present 2026-06-09 14:08:25 +01:00
2 changed files with 16 additions and 0 deletions
Expand all files Collapse all files

4
autoenv/autoenv.zsh
View File

@@ -246,6 +246,8 @@ _autoenv_enter() {
(( ${+_autoenv_entered[${_autoenv_entered[(i)$entered]}]} )) && return (( ${+_autoenv_entered[${_autoenv_entered[(i)$entered]}]} )) && return
# If the enter script is not authorized, return. # If the enter script is not authorized, return.
_autoenv_authorized $entered/.enter || return _autoenv_authorized $entered/.enter || return
# Clear positional parameters so they don't leak into the sourced script.
set --
# Source the enter script. # Source the enter script.
source $entered/.enter source $entered/.enter
# Add the entered directory to the global entered array. # Add the entered directory to the global entered array.
@@ -258,6 +260,8 @@ _autoenv_exit() {
local entered=$1 local entered=$1
# If the exit script is not authorized, return. # If the exit script is not authorized, return.
_autoenv_authorized $entered/.exit || return _autoenv_authorized $entered/.exit || return
# Clear positional parameters so they don't leak into the sourced script.
set --
# Source the exit script. # Source the exit script.
source $entered/.exit source $entered/.exit
# Remove the entered directory from the global entered array. # Remove the entered directory from the global entered array.

12
worktree/worktree.plugin.zsh
View File

@@ -44,6 +44,9 @@ Manage git worktrees by branch name."
_autoenv_authorized $wt_dest/.enter yes _autoenv_authorized $wt_dest/.enter yes
_autoenv_authorized $wt_dest/.exit yes _autoenv_authorized $wt_dest/.exit yes
fi fi
if [ -f $root/local.bazelrc ]; then
cp $root/local.bazelrc $wt_dest/local.bazelrc
fi
;; ;;
cd) cd)
@@ -170,6 +173,15 @@ Manage git worktrees by branch name."
_autoenv_authorized "$wt_path/$f" yes _autoenv_authorized "$wt_path/$f" yes
print -P "%F{green}updated:%f $wt_path/$f" print -P "%F{green}updated:%f $wt_path/$f"
done done
if [[ -f "$root/local.bazelrc" ]]; then
if [[ -L "$wt_path/local.bazelrc" ]]; then
rm "$wt_path/local.bazelrc"
elif [[ -f "$wt_path/local.bazelrc" ]] && cmp -s "$root/local.bazelrc" "$wt_path/local.bazelrc"; then
continue
fi
cp "$root/local.bazelrc" "$wt_path/local.bazelrc"
print -P "%F{green}updated:%f $wt_path/local.bazelrc"
fi
done done
return $failed return $failed
;; ;;