fix(_umount,feh,sbopkg): check diretory name for _comp_compgen -C
#1297
+9
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In the current master, an error message is printed on the TAB completion with the following command line (where the cursor position is placed before the marker "[TAB]"): $ set -u $ feh --font x[TAB] --fontpath bash: words[i + 1]: unbound variable
* fix(_umount): specify the correct path as a directory * fix(feh): check the directory name before attempting path completion * fix(sbopkg): check the QUEUEDIR value before generating *.sqf
akinomyoga
commented
Dec 30, 2024
| -f -X "!*.@([tT][tT][fF])" -S / | ||
| if [[ -d $font_path ]]; then | ||
| _comp_compgen -aC "$font_path" -- \ | ||
| -f -X "!*.@([tT][tT][fF])" -S / |
There was a problem hiding this comment.
Unrelated to the present topic, but I'm wondering about the reasoning for using -f -X "!globpat" instead of simply -G "globpat". In the codebase, we only have two uses of -G globpat:
./completions/mdtool:35: _comp_compgen -- -o filenames -G"*.mds"
./completions/rcs:24: _comp_compgen -aR -- -G "$dir/$file*,v"
while we have many for -f -X "!globpat":
./completions/explodepkg:3:complete -o plusdirs -f -X '!*.t[bglx]z' explodepkg
./completions/feh:32: # _comp_compgen -C "$font_path" -- -f -X "!*.@([tT][tT][fF])" -S /
./completions/feh:38: -f -X "!*.@([tT][tT][fF])" -S /
./completions/gdb:41: _comp_compgen -a -- -f -X '!?(*/)core?(.?*)' -o plusdirs
./completions/java:87: _comp_compgen -av tmp -c "$i/$cur" -- -f -X '!*.class'
./completions/lzip:47: _comp_compgen -- -f -X "*.lz" -o plusdirs
./completions/sbopkg:67: _comp_compgen -aC "$QUEUEDIR" -- -f -X "!*.sqf"
./completions/_slackpkg:68: _comp_compgen -C "$confdir/templates" -- -f -X \
"!?*.template" && COMPREPLY=("${COMPREPLY[@]%.template}")
./completions/upgradepkg:18: _comp_compgen -- -P "$prev%" -f -X "!*.@(t[bgxl]z)" || nofiles=setedit: One possibile explanation is that they derived from the pattern -f -X "$_xspec" used in _comp_compgen_filedir. In that case, we can probably use -G.
edit: I also checked the history of the support for -G by the compgen builtin, but the option -G seems to have existed from the beginning when compgen was introduced in Bash 2.04 (1999).
There was a problem hiding this comment.
I also think the following @(...) are not needed (where ... does not contain |):
./completions/feh:32: # _comp_compgen -C "$font_path" -- -f -X "!*.@([tT][tT][fF])" -S /
./completions/feh:38: -f -X "!*.@([tT][tT][fF])" -S /
./completions/upgradepkg:18: _comp_compgen -- -P "$prev%" -f -X "!*.@(t[bgxl]z)" || nofiles=set
./completions/valgrind:10: if [[ ${words[i]} != @([-=])* ]]; then
akinomyoga
changed the title
_comp_compgen -C
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1260
This is an alternative fix to #1290. The fix suggested in #1290 was just to remove the error message, which I believe is not the right fix. This PR fixes it by checking the arguments at the caller side.
This includes an additional fix e9e665e for
feh. In the currentmainbranch, an error message is printed on the TAB completion with the following command line: