Skip to contentSkip to conversation

setsebool: improve bash-completion script

PATCH In review Christian Göttsche 2 participants 3 messages Jul 6, 2023 – Aug 4, 2023 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 setsebool: improve bash-completion script

Support the usage format of multiple booleans to change, e.g.:

setsebool bool1=on bool2=off

Support the options -N and -V.

---
 .../setsebool/setsebool-bash-completion.sh    | 54 ++++++++++++++-----
 1 file changed, 42 insertions(+), 12 deletions(-)
policycoreutils/setsebool/setsebool-bash-completion.sh +42 -12
index d0f3b424..f7fe0c0c 100644
@@ -15,26 +15,56 @@
 # You should have received a copy of the GNU General Public License
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-__contains_word () {
-        local word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
-        return 1
-}
-
 __get_all_booleans () {
     getsebool -a | cut -f1 -d' '
 }
 
 _setsebool () {
-        local command=${COMP_WORDS[1]}
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local verb comps
 
-	if   [ "$verb" = "" -a "$prev" = "setsebool" -o "$prev" = "-P" ]; then
-	        COMPREPLY=( $(compgen -W "-P $( __get_all_booleans ) " -- "$cur") )
-		return 0
+        if [ "$prev" = '=' ]; then
+                COMPREPLY=( $(compgen -W "on off" -- "$cur") )
+                return 0
         fi
-        COMPREPLY=( $(compgen -W "0 1 -P" -- "$cur") )
+
+        case "$cur" in
+        '0')
+                COMPREPLY=( $(compgen -W "0 1" -- "$cur") )
+                return 0
+        ;;
+        '1')
+                COMPREPLY=( $(compgen -W "0 1" -- "$cur") )
+                return 0
+        ;;
+        =)
+                COMPREPLY=( $(compgen -W "on off" -- "") )
+                return 0
+        ;;
+        -*)
+                COMPREPLY=( $(compgen -W "-N -P -V" -- "$cur") )
+                return 0
+        ;;
+        '')
+                if [ "$prev" = '0' ] || [ "$prev" = '1' ]; then
+                        COMPREPLY=( $(compgen -W "-N -P -V" -- "$cur") )
+                        return 0
+                fi
+                if getsebool "$prev" > /dev/null 2>&1; then
+                        COMPREPLY=( $(compgen -W "0 1" -- "$cur") )
+                        return 0
+                fi
+        ;;
+        *)
+                if getsebool "$cur" > /dev/null 2>&1; then
+                        COMPREPLY=( $(compgen -W '$( __get_all_booleans ) "$cur=on " "$cur=off "' -- "$cur") )
+                        compopt -o nospace
+                        return 0
+                fi
+        ;;
+        esac
+
+        COMPREPLY=( $(compgen -W '"-N " "-P " "-V " $( __get_all_booleans ) ' -- "$cur") )
+        compopt -o nospace
         return 0
 }
 
Signature · 1 line
2.40.1
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Christian Göttsche

Support the usage format of multiple booleans to change, e.g.:

setsebool bool1=on bool2=off

Support the options -N and -V.

Quoted 80 lines
---
 .../setsebool/setsebool-bash-completion.sh    | 54 ++++++++++++++-----
 1 file changed, 42 insertions(+), 12 deletions(-)
policycoreutils/setsebool/setsebool-bash-completion.sh +42 -13
index d0f3b424..f7fe0c0c 100644
@@ -15,26 +15,56 @@
 # You should have received a copy of the GNU General Public License
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-__contains_word () {
-        local word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
-        return 1
-}
-
 __get_all_booleans () {
     getsebool -a | cut -f1 -d' '
 }
 
 _setsebool () {
-        local command=${COMP_WORDS[1]}
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local verb comps
 
-       if   [ "$verb" = "" -a "$prev" = "setsebool" -o "$prev" = "-P" ]; then
-               COMPREPLY=( $(compgen -W "-P $( __get_all_booleans ) " -- "$cur") )
-               return 0
+        if [ "$prev" = '=' ]; then
+                COMPREPLY=( $(compgen -W "on off" -- "$cur") )
+                return 0
         fi
-        COMPREPLY=( $(compgen -W "0 1 -P" -- "$cur") )
+
+        case "$cur" in
+        '0')
+                COMPREPLY=( $(compgen -W "0 1" -- "$cur") )
+                return 0
+        ;;
+        '1')
+                COMPREPLY=( $(compgen -W "0 1" -- "$cur") )
+                return 0
+        ;;
+        =)
+                COMPREPLY=( $(compgen -W "on off" -- "") )
+                return 0
+        ;;
+        -*)
+                COMPREPLY=( $(compgen -W "-N -P -V" -- "$cur") )
+                return 0
+        ;;
+        '')
+                if [ "$prev" = '0' ] || [ "$prev" = '1' ]; then
+                        COMPREPLY=( $(compgen -W "-N -P -V" -- "$cur") )
+                        return 0
+                fi
+                if getsebool "$prev" > /dev/null 2>&1; then
+                        COMPREPLY=( $(compgen -W "0 1" -- "$cur") )
+                        return 0
+                fi
+        ;;
+        *)
+                if getsebool "$cur" > /dev/null 2>&1; then
+                        COMPREPLY=( $(compgen -W '$( __get_all_booleans ) "$cur=on " "$cur=off "' -- "$cur") )
+                        compopt -o nospace
+                        return 0
+                fi
+        ;;
+        esac
+
+        COMPREPLY=( $(compgen -W '"-N " "-P " "-V " $( __get_all_booleans ) ' -- "$cur") )
+        compopt -o nospace
         return 0
 }
 
--

2.40.1

#2 lore raw
Quoted 6 lines · James Carter
Quoted 3 lines · Christian Göttsche

Support the usage format of multiple booleans to change, e.g.:

Quoted 8 lines
Quoted 5 lines

setsebool bool1=on bool2=off

Support the options -N and -V.

Merged.
Thanks,
Jim

Quoted 80 lines
Quoted 80 lines
---
 .../setsebool/setsebool-bash-completion.sh    | 54 ++++++++++++++-----
 1 file changed, 42 insertions(+), 12 deletions(-)
policycoreutils/setsebool/setsebool-bash-completion.sh +42 -13
index d0f3b424..f7fe0c0c 100644
@@ -15,26 +15,56 @@
 # You should have received a copy of the GNU General Public License
 # along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-__contains_word () {
-        local word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
-        return 1
-}
-
 __get_all_booleans () {
     getsebool -a | cut -f1 -d' '
 }
 
 _setsebool () {
-        local command=${COMP_WORDS[1]}
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local verb comps
 
-       if   [ "$verb" = "" -a "$prev" = "setsebool" -o "$prev" = "-P" ]; then
-               COMPREPLY=( $(compgen -W "-P $( __get_all_booleans ) " -- "$cur") )
-               return 0
+        if [ "$prev" = '=' ]; then
+                COMPREPLY=( $(compgen -W "on off" -- "$cur") )
+                return 0
         fi
-        COMPREPLY=( $(compgen -W "0 1 -P" -- "$cur") )
+
+        case "$cur" in
+        '0')
+                COMPREPLY=( $(compgen -W "0 1" -- "$cur") )
+                return 0
+        ;;
+        '1')
+                COMPREPLY=( $(compgen -W "0 1" -- "$cur") )
+                return 0
+        ;;
+        =)
+                COMPREPLY=( $(compgen -W "on off" -- "") )
+                return 0
+        ;;
+        -*)
+                COMPREPLY=( $(compgen -W "-N -P -V" -- "$cur") )
+                return 0
+        ;;
+        '')
+                if [ "$prev" = '0' ] || [ "$prev" = '1' ]; then
+                        COMPREPLY=( $(compgen -W "-N -P -V" -- "$cur") )
+                        return 0
+                fi
+                if getsebool "$prev" > /dev/null 2>&1; then
+                        COMPREPLY=( $(compgen -W "0 1" -- "$cur") )
+                        return 0
+                fi
+        ;;
+        *)
+                if getsebool "$cur" > /dev/null 2>&1; then
+                        COMPREPLY=( $(compgen -W '$( __get_all_booleans ) "$cur=on " "$cur=off "' -- "$cur") )
+                        compopt -o nospace
+                        return 0
+                fi
+        ;;
+        esac
+
+        COMPREPLY=( $(compgen -W '"-N " "-P " "-V " $( __get_all_booleans ) ' -- "$cur") )
+        compopt -o nospace
         return 0
 }
 
--

2.40.1