Skip to content

feat(sudo): option arg (non-)completion improvements #1683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scop merged 3 commits into from
Jul 9, 2026
+5 −4
Merged

feat(sudo): option arg (non-)completion improvements #1683

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4845545
feat(sudo): recognize --preserve-env taking an arg
scop Jul 8, 2026
cc679cc
fix(sudo): do not offer completions after --help/--version
scop Jul 8, 2026
80156e3
refactor(sudo): order options the consistent with --help output
scop Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions completions-core/sudo.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ _comp_cmd_sudo()
local i mode=normal
[[ $1 == *sudoedit ]] && mode=edit

local noargopts='!(-*|*[CDghpRrTtUu]*)'
local noargopts='!(-*|*[CDghpRrtTUu]*)'
[[ $mode == normal ]] &&
for ((i = 1; i <= cword; i++)); do
if [[ ${words[i]} != -* ]]; then
Expand All @@ -23,7 +23,7 @@ _comp_cmd_sudo()
break
fi
# shellcheck disable=SC2254
[[ ${words[i]} == @(--@(close-from|chdir|group|host|prompt|chroot|role|command-timeout|type|other-user|user)|-${noargopts}[CDghpRrTtUu]) ]] &&
[[ ${words[i]} == @(--@(close-from|chdir|preserve-env|group|host|prompt|chroot|role|type|command-timeout|user|other-user)|-${noargopts}[CDghpRrtTUu]) ]] &&
((i++))
done

Expand All @@ -37,8 +37,9 @@ _comp_cmd_sudo()
_comp_compgen -- -g
return
;;
--close-from | --prompt | --role | --type | --command-timeout | \
-${noargopts}[CprTt])
--close-from | --preserve-env | --help | --prompt | --role | --type | \
--command-timeout | --version | \
-${noargopts}[CprTtV]) # no "h", sudo.ws treats it as host with arg
return
;;
--chdir | --chroot | -${noargopts}[DR])
Expand Down