From 93eea8de663e25cdeb7244cf48c862cadde3b9bf Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Thu, 13 Nov 2014 12:18:22 -0800 Subject: [PATCH] Filter lines starting with hash from /etc/shells and /etc/group Fixes the useradd completion when these files contains comment lines --- share/completions/useradd.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/completions/useradd.fish b/share/completions/useradd.fish index dec568c88..7bab97dc0 100644 --- a/share/completions/useradd.fish +++ b/share/completions/useradd.fish @@ -18,5 +18,5 @@ complete -c useradd -s u -l uid --description 'The numerical value of the user\' complete -c useradd -s b -l base-dir --description 'The initial path prefix for a new user\'s home directory' -r -a '(__fish_complete_directories)' complete -c useradd -s e -l expiredate --description 'The date on which the user account is disabled' -r complete -c useradd -s f -l inactive --description 'The number of days after a password has expired before the account will be disabled' -r -complete -c useradd -s g -l gid --description 'The group name or ID for a new user\'s initial group' -x -a '(cat /etc/group|cut -d : -f 1,3|sed -e "s/:/\n/")' -complete -c useradd -s s -l shell --description 'Name of the new user\'s login shell' -x -a '(cat /etc/shells)' +complete -c useradd -s g -l gid --description 'The group name or ID for a new user\'s initial group' -x -a '(sgrep "^[^#]" /etc/group|cut -d : -f 1,3|sed -e "s/:/\n/")' +complete -c useradd -s s -l shell --description 'Name of the new user\'s login shell' -x -a '(sgrep "^[^#]" /etc/shells)'