From f49ed59c73a775371dba7d940bf1eb93564db18a Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Thu, 7 Dec 2023 20:01:11 -0500 Subject: [PATCH] Remove Bash completion for doas (zsh is the intended user shell) --- chrootInstall.sh | 1 - config-files/doas-completion | 45 ------------------------------------ install.sh | 2 +- 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 config-files/doas-completion diff --git a/chrootInstall.sh b/chrootInstall.sh index 2696f83..2a122e3 100755 --- a/chrootInstall.sh +++ b/chrootInstall.sh @@ -58,7 +58,6 @@ permit nopass :wheel as root cmd /usr/local/bin/powerset.sh permit nopass :wheel as root cmd /usr/bin/poweroff permit nopass :wheel as root cmd /usr/bin/reboot " > /etc/doas.conf -curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/doas-completion -o /usr/share/bash-completion/completions/doas ln -s /usr/bin/doas /usr/local/bin/sudo # pacman configuration diff --git a/config-files/doas-completion b/config-files/doas-completion deleted file mode 100644 index 1b5abc6..0000000 --- a/config-files/doas-completion +++ /dev/null @@ -1,45 +0,0 @@ -# doas(1) completion -*- shell-script -*- - -_comp_cmd_doas() -{ - local cur prev words cword split - _init_completion -s || return - - local i - - for ((i = 1; i <= cword; i++)); do - if [[ ${words[i]} != -* ]]; then - local PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin - local root_command=${words[i]} - _command_offset $i - return - fi - [[ ${words[i]} == -@(!(-*)[uCLs]) ]] && - ((i++)) - done - - case "$prev" in - -!(-*)u) - COMPREPLY=($(compgen -u -- "$cur")) - return - ;; - -!(-*)C) - _filedir - return - ;; - -!(-*)[Ls]) - return - ;; - esac - - $split && return - - if [[ $cur == -* ]]; then - COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur")) - [[ ${COMPREPLY-} == *= ]] && compopt -o nospace - return - fi -} && - complete -F _comp_cmd_doas doas - -# ex: filetype=sh diff --git a/install.sh b/install.sh index 203a5ed..3c0dd13 100755 --- a/install.sh +++ b/install.sh @@ -3,7 +3,7 @@ loadkeys us echo ---------------------------------------------------------------------------------------------- echo rwinkhart\'s artix install script -echo last updated december 07, 2023 \(rev. F\) +echo last updated december 07, 2023 \(rev. G\) echo ---------------------------------------------------------------------------------------------- echo You will be asked some questions before installation. echo -e "----------------------------------------------------------------------------------------------\n"