]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
bash-completion: update few options changed since v2.26
authorSami Kerola <kerolasa@iki.fi>
Sun, 2 Aug 2015 20:24:08 +0000 (21:24 +0100)
committerKarel Zak <kzak@redhat.com>
Mon, 3 Aug 2015 10:35:18 +0000 (12:35 +0200)
Attempt to find and update all changes to command line options that has
not been reflected in bash-completion files in between versions v2.26 to
v2.27-rc1.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
bash-completion/fdisk
bash-completion/findmnt
bash-completion/logger
bash-completion/lslocks
bash-completion/sfdisk

index 72a2b42362fa32be56849b3a7a8aca77394d31ee..0ba522ee488f3c0fddf3ba4c056161f5ac53e986 100644 (file)
@@ -36,6 +36,7 @@ _fdisk_module()
        case $cur in
                -*)
                        OPTS="--sector-size
+                               --protect-boot
                                --compatibility
                                --color
                                --list
index 3ad914735fd3ef76e3071c8e0bb6757c30ec02c2..d7e06c8d40cc79c6f62be67358edfa704e4ce479 100644 (file)
@@ -85,6 +85,12 @@ _findmnt_module()
                        COMPREPLY=( $(compgen -W "$DEV_MPOINT" -- $cur) )
                        return 0
                        ;;
+               '-M'|'--mountpoint')
+                       local IFS=$'\n'
+                       compopt -o filenames
+                       COMPREPLY=( $(compgen -o dirnames -- ${cur:-"/") )
+                       return 0
+                       ;;
                '-h'|'--help'|'-V'|'--version')
                        return 0
                        ;;
@@ -105,6 +111,7 @@ _findmnt_module()
                                --tab-file
                                --first-only
                                --invert
+                               --json
                                --list
                                --task
                                --noheadings
@@ -118,6 +125,7 @@ _findmnt_module()
                                --submounts
                                --source
                                --target
+                               --mountpoint
                                --help
                                --version"
                        COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
index dcbfa9b62a2237f2cac5dab878ca24ffe38823f2..7f7f086ca0858859e2f7bd1ce7e4bd0d4c409db2 100644 (file)
@@ -31,13 +31,38 @@ _logger_module()
                        COMPREPLY=( $(compgen -W "$(awk '$NF ~ /^\// {print $NF}' /proc/net/unix)" -- $cur) )
                        return 0
                        ;;
+               '--msgid')
+                       COMPREPLY=( $(compgen -W "msgid" -- $cur) )
+                       return 0
+                       ;;
                '-h'|'--help'|'-V'|'--version')
                        return 0
                        ;;
        esac
        case $cur in
                -*)
-                       OPTS="--journald --udp --id --file --help --server --skip-empty --port --priority --rfc3164 --rfc5424 --stderr --tag --size --socket --version"
+                       OPTS="
+                               --file
+                               --help
+                               --id
+                               --journald
+                               --msgid
+                               --no-act
+                               --octet-count
+                               --port
+                               --prio-prefix
+                               --priority
+                               --rfc3164
+                               --rfc5424
+                               --server
+                               --size
+                               --skip-empty
+                               --socket
+                               --stderr
+                               --tag
+                               --udp
+                               --version
+                       "
                        COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
                        return 0
                        ;;
index 6ad6c057a4c2587b43a2f6f48961110aa7c21366..0fd0acd001cc5e3983730fdda566ba90704b40db 100644 (file)
@@ -34,6 +34,7 @@ _lslocks_module()
        case $cur in
                -*)
                        OPTS="--pid
+                               --json
                                --output
                                --noheadings
                                --raw
index 9128313ee766a49f2d0d06498aa6f3a059cbc0ca..f8ae1f1b0f73adc8857016c6f733d5bcdf9bdbc4 100644 (file)
@@ -5,14 +5,14 @@ _sfdisk_module()
        cur="${COMP_WORDS[COMP_CWORD]}"
        prev="${COMP_WORDS[COMP_CWORD-1]}"
        case $prev in
-               '-u'|'--unit')
-                       COMPREPLY=( $(compgen -W "S C B M" -- $cur) )
-                       return 0
-                       ;;
                '-n'|'-C'|'--cylinders'|'-H'|'--heads'|'-S'|'--sectors')
                        COMPREPLY=( $(compgen -W "number" -- $cur) )
                        return 0
                        ;;
+               '--color')
+                       COMPREPLY=( $(compgen -W "auto never always" -- $cur) )
+                       return 0
+                       ;;
                '-O'|'-I')
                        local IFS=$'\n'
                        compopt -o filenames
@@ -28,48 +28,36 @@ _sfdisk_module()
                        cur=${cur#=}
                        ;;
                -*)
-                       OPTS="--show-size
-                               --id
-                               --change-id
-                               --print-id
+                       OPTS="
+                               --activate
+                               --dump
+                               --json
+                               --show-geometry
                                --list
                                --list-free
-                               --dump
-                               --increment
-                               --unit
-                               --one-only
+                               --show-size
                                --list-types
-                               --DOS
-                               --DOS-extended
-                               --re-read
-                               -N
-                               -n
-                               -O
-                               -I
                                --verify
-                               --version
-                               --help
+                               --part-label
+                               --part-type
+                               --part-uuid
+                               --part-attrs
+                               --append
+                               --backup
+                               --bytes
                                --force
+                               --color
+                               --partno
+                               --no-act
                                --no-reread
+                               --backup-file
+                               --output
                                --quiet
-                               --Linux
-                               --show-geometry
-                               --show-pt-geometry
-                               --activate=
-                               --unhide=
-                               --show-extended
-                               --leave-last
-                               --IBM
-                               --in-order
-                               --not-in-order
-                               --inside-outer
-                               --not-inside-outer
-                               --nested
-                               --chained
-                               --onesector
-                               --cylinders
-                               --heads
-                               --sectors"
+                               --label
+                               --label-nested
+                               --help
+                               --version
+                       "
                        COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
                        return 0
                        ;;