druckdev/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zsh:_conf: Fix some directory stack empty errors

Browse Source 
Fix two cases where `popd` could try to pop from an empty stack.
This commit is contained in:
Julian Prein
2025-04-29 11:31:03 +02:00
parent b722b9aaec
commit aafb9a5a3a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.config/zsh/completion/_conf
View File

@@ -3,6 +3,8 @@
## Author: druckdev ## Author: druckdev
## Created: 2020-04-19 ## Created: 2020-04-19
emulate -L zsh -o EXTENDED_GLOB -o NO_PUSHD_IGNORE_DUPS -o GLOB_DOTS
local _MAX_DEPTH=2 local _MAX_DEPTH=2
local w1="${words[$#words - 1]}" local w1="${words[$#words - 1]}"
@@ -11,6 +13,8 @@ local w3="${words[$#words - 3]}"
if [ -z $w2 ]; then # first word to complete if [ -z $w2 ]; then # first word to complete
# move into config directory # move into config directory
# NOTE: requires NO_PUSHD_IGNORE_DUPS in case we're already in the directory
# (should be off by default already)
pushd -q "${XDG_CONFIG_HOME:-$HOME/.config}/" pushd -q "${XDG_CONFIG_HOME:-$HOME/.config}/"
# list all directories # list all directories
local paths="$(find -L *(-/) -maxdepth $_MAX_DEPTH -type d 2>/dev/null | xargs)" local paths="$(find -L *(-/) -maxdepth $_MAX_DEPTH -type d 2>/dev/null | xargs)"
@@ -20,6 +24,7 @@ if [ -z $w2 ]; then # first word to complete
# move into HOME # move into HOME
pushd -q "$HOME" pushd -q "$HOME"
# list all directories starting with a dot (but remove that dot) # list all directories starting with a dot (but remove that dot)
# NOTE: requires EXTENDED_GLOB
paths+="$(find -L .*~.cache(-/) -maxdepth $_MAX_DEPTH -type d 2>/dev/null | sed 's/^\.//' | xargs)" paths+="$(find -L .*~.cache(-/) -maxdepth $_MAX_DEPTH -type d 2>/dev/null | sed 's/^\.//' | xargs)"
# move back from HOME # move back from HOME
popd -q popd -q
@@ -33,10 +38,13 @@ elif [ -z $w3 ]; then # second word to complete
pushd -q "${XDG_CONFIG_HOME:-$HOME/.config}/$w1" pushd -q "${XDG_CONFIG_HOME:-$HOME/.config}/$w1"
elif [ -d "$HOME/.$w1" ]; then elif [ -d "$HOME/.$w1" ]; then
pushd -q "$HOME/.$w1" pushd -q "$HOME/.$w1"
else
return
fi fi
# check if there are any files here # check if there are any files here
# eval "local $(echo $functions[conf] | grep CONF_PATTERNS= | sed -E 's/\$(\{?)1(\}?)/\$\1w1\2/g; s/^[ \t]*//')" # eval "local $(echo $functions[conf] | grep CONF_PATTERNS= | sed -E 's/\$(\{?)1(\}?)/\$\1w1\2/g; s/^[ \t]*//')"
# NOTE: requires GLOB_DOTS
local exist=( *(-.) ) 2>/dev/null local exist=( *(-.) ) 2>/dev/null
# complete (symlinks pointing to) files # complete (symlinks pointing to) files