diff options
-rw-r--r-- | bash-completion/Makemodule.am | 6 | ||||
-rw-r--r-- | bash-completion/blkdiscard | 13 | ||||
-rw-r--r-- | bash-completion/chmem | 29 | ||||
-rw-r--r-- | bash-completion/dmesg | 6 | ||||
-rw-r--r-- | bash-completion/fallocate | 16 | ||||
-rw-r--r-- | bash-completion/flock | 1 | ||||
-rw-r--r-- | bash-completion/hwclock | 4 | ||||
-rw-r--r-- | bash-completion/ldattach | 10 | ||||
-rw-r--r-- | bash-completion/losetup | 10 | ||||
-rw-r--r-- | bash-completion/lscpu | 4 | ||||
-rw-r--r-- | bash-completion/lsipc | 74 | ||||
-rw-r--r-- | bash-completion/lsmem | 52 | ||||
-rw-r--r-- | bash-completion/lsns | 2 | ||||
-rw-r--r-- | bash-completion/mount | 31 | ||||
-rw-r--r-- | bash-completion/mountpoint | 4 | ||||
-rw-r--r-- | bash-completion/nsenter | 19 | ||||
-rw-r--r-- | bash-completion/rtcwake | 15 | ||||
-rw-r--r-- | bash-completion/setarch | 17 | ||||
-rw-r--r-- | bash-completion/setsid | 2 | ||||
-rw-r--r-- | bash-completion/umount | 19 | ||||
-rw-r--r-- | bash-completion/unshare | 14 | ||||
-rw-r--r-- | bash-completion/zramctl | 4 |
22 files changed, 253 insertions, 99 deletions
diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am index d94b995dc..a884a138e 100644 --- a/bash-completion/Makemodule.am +++ b/bash-completion/Makemodule.am @@ -208,6 +208,9 @@ endif if BUILD_CHCPU dist_bashcompletion_DATA += bash-completion/chcpu endif +if BUILD_CHMEM +dist_bashcompletion_DATA += bash-completion/chmem +endif if BUILD_EJECT dist_bashcompletion_DATA += bash-completion/eject endif @@ -223,6 +226,9 @@ endif if BUILD_LSCPU dist_bashcompletion_DATA += bash-completion/lscpu endif +if BUILD_LSMEM +dist_bashcompletion_DATA += bash-completion/lsmem +endif if BUILD_LOSETUP dist_bashcompletion_DATA += bash-completion/losetup endif diff --git a/bash-completion/blkdiscard b/bash-completion/blkdiscard index aa2f6f645..64a5c34d5 100644 --- a/bash-completion/blkdiscard +++ b/bash-completion/blkdiscard @@ -5,7 +5,7 @@ _blkdiscard_module() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in - '-o'|'--offset'|'-l'|'--length') + '-o'|'--offset'|'-l'|'--length'|'-p'|'--step') COMPREPLY=( $(compgen -W "num" -- $cur) ) return 0 ;; @@ -15,7 +15,16 @@ _blkdiscard_module() esac case $cur in -*) - OPTS="--offset --length --secure --verbose --help --version" + OPTS=" + --offset + --length + --step + --secure + --zeroout + --verbose + --help + --version + " COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) return 0 ;; diff --git a/bash-completion/chmem b/bash-completion/chmem new file mode 100644 index 000000000..00b870dbd --- /dev/null +++ b/bash-completion/chmem @@ -0,0 +1,29 @@ +_chmem_module() +{ + local cur prev OPTS + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + case $prev in + '-h'|'--help'|'-V'|'--version') + return 0 + ;; + esac + case $cur in + -*) + OPTS=" + --enable + --disable + --blocks + --verbose + --help + --version + " + COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) + return 0 + ;; + esac + COMPREPLY=( $(compgen -W "size range blockrange" -- $cur) ) + return 0 +} +complete -F _chmem_module chmem diff --git a/bash-completion/dmesg b/bash-completion/dmesg index eab41ba08..5073e5b3e 100644 --- a/bash-completion/dmesg +++ b/bash-completion/dmesg @@ -1,3 +1,4 @@ + _dmesg_module() { local cur prev OPTS @@ -23,6 +24,10 @@ _dmesg_module() COMPREPLY=( $(compgen -W "size" -- $cur) ) return 0 ;; + '--time-format') + COMPREPLY=( $(compgen -W "delta reltime ctime notime iso" -- $cur) ) + return 0 + ;; '-h'|'--help'|'-V'|'--version') return 0 ;; @@ -46,6 +51,7 @@ _dmesg_module() --buffer-size --ctime --notime + --time-format --userspace --follow --decode diff --git a/bash-completion/fallocate b/bash-completion/fallocate index 561a9a4b1..670874c96 100644 --- a/bash-completion/fallocate +++ b/bash-completion/fallocate @@ -15,14 +15,20 @@ _fallocate_module() esac case $cur in -*) - OPTS="--keep-size - --punch-hole + OPTS=" + --collapse-range --dig-holes - --offset + --insert-range --length - --help + --keep-size + --offset + --punch-hole + --zero-range + --posix --verbose - --version" + --help + --version + " COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) return 0 ;; diff --git a/bash-completion/flock b/bash-completion/flock index 8e7f8b859..cb68245c8 100644 --- a/bash-completion/flock +++ b/bash-completion/flock @@ -32,6 +32,7 @@ _flock_module() --conflict-exit-code --close --command + --no-fork --help --version" COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) diff --git a/bash-completion/hwclock b/bash-completion/hwclock index 89b17bd07..b90f00c0c 100644 --- a/bash-completion/hwclock +++ b/bash-completion/hwclock @@ -12,7 +12,7 @@ _hwclock_module() return 0 ;; '--date') - COMPREPLY=( $(compgen -W "date" -- $cur) ) + COMPREPLY=( $(compgen -W "time" -- $cur) ) return 0 ;; '--epoch') @@ -40,9 +40,9 @@ _hwclock_module() --localtime --rtc --directisa - --badyear --date --epoch + --update-drift --noadjfile --adjfile --test diff --git a/bash-completion/ldattach b/bash-completion/ldattach index 0b9d26034..02b4b5b93 100644 --- a/bash-completion/ldattach +++ b/bash-completion/ldattach @@ -9,6 +9,14 @@ _ldattach_module() COMPREPLY=( $(compgen -W "speed" -- $cur) ) return 0 ;; + '-c'|'--intro-command') + COMPREPLY=( $(compgen -W "string" -- $cur) ) + return 0 + ;; + '-p'|'--pause') + COMPREPLY=( $(compgen -W "seconds" -- $cur) ) + return 0 + ;; '-i'|'--iflag') local IFLAGS IFLAGS="BRKINT ICRNL IGNBRK IGNCR IGNPAR IMAXBEL @@ -28,6 +36,8 @@ _ldattach_module() -*) OPTS="--debug --speed + --intro-command + --pause --sevenbits --eightbits --noparity diff --git a/bash-completion/losetup b/bash-completion/losetup index 629d34b78..7fee1d0ae 100644 --- a/bash-completion/losetup +++ b/bash-completion/losetup @@ -30,7 +30,7 @@ _losetup_module() prefix="${cur%$realcur}" OUTPUT_ALL="NAME AUTOCLEAR BACK-FILE BACK-INO BACK-MAJ:MIN MAJ:MIN OFFSET PARTSCAN RO - SIZELIMIT" + SIZELIMIT DIO" for WORD in $OUTPUT_ALL; do if ! [[ $prefix == *"$WORD"* ]]; then OUTPUT="$WORD $OUTPUT" @@ -52,14 +52,18 @@ _losetup_module() --find --set-capacity --associated - --list + --nooverlap --offset - --output --sizelimit --partscan --read-only --show --verbose + --json + --list + --noheadings + --output + --raw --help --version" COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) diff --git a/bash-completion/lscpu b/bash-completion/lscpu index d28599db2..d16af350f 100644 --- a/bash-completion/lscpu +++ b/bash-completion/lscpu @@ -11,7 +11,7 @@ _lscpu_module() realcur="${cur##*,}" prefix="${cur%$realcur}" OPTS_ALL="CPU CORE SOCKET NODE - BOOK CACHE POLARIZATION ADDRESS + BOOK DRAWER CACHE POLARIZATION ADDRESS CONFIGURED ONLINE MAXMHZ MINMHZ" for WORD in $OPTS_ALL; do if ! [[ $prefix == *"$WORD"* ]]; then @@ -31,10 +31,12 @@ _lscpu_module() OPTS_ALL="--all --online --offline + --json --extended= --parse= --sysroot --hex + --physical --help --version" COMPREPLY=( $(compgen -W "${OPTS_ALL[*]}" -- $cur) ) diff --git a/bash-completion/lsipc b/bash-completion/lsipc index 6ce0551a5..ffe44b7d1 100644 --- a/bash-completion/lsipc +++ b/bash-completion/lsipc @@ -12,15 +12,27 @@ _lsipc_module() '-h'|'--help'|'-V'|'--version') return 0 ;; + '--time-format') + COMPREPLY=( $(compgen -W "short full iso" -- $cur) ) + return 0 + ;; '-o'|'--output') local prefix realcur OUTPUT_ALL OUTPUT realcur="${cur##*,}" prefix="${cur%$realcur}" - OUTPUT_ALL="GENERAL KEY ID OWNER PERMS CUID - CGID UID GID CHANGE MESSAGE USEDBYTES - MSGS SEND RECV LSPID LRPID SHARED BYTES - NATTCH STATUS ATTACH DETACH CPID LPID NSEMS - LASTOP" + OUTPUT_ALL=" + KEY ID OWNER PERMS CUID CUSER CGID + CGROUP UID USER GID GROUP CTIME + + SIZE NATTCH STATUS ATTACH DETACH + COMMAND CPID LPID + + USEDBYTES MSGS SEND RECV LSPID LRPID + + NSEMS OTIME + + RESOURCE DESCRIPTION LIMIT USED USE% + " for WORD in $OUTPUT_ALL; do if ! [[ $prefix == *"$WORD"* ]]; then OUTPUT="$WORD $OUTPUT" @@ -31,35 +43,29 @@ _lsipc_module() return 0 ;; esac - case $cur in - -*) - OPTS="--id - --help - --version - --shmems - --queues - --semaphores - --colon-separate - --creator - --export - --global - --json - --newline - --noheadings - --notruncate - --output - --pid - --print0 - --raw - --time - --time-format" - COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) - return 0 - ;; - esac - local IFS=$'\n' - compopt -o filenames - COMPREPLY=( $(compgen -f -- $cur) ) + OPTS=" + --shmems + --queues + --semaphores + --global + --id + --noheadings + --notruncate + --time-format + --bytes + --creator + --export + --json + --newline + --list + --output + --numeric-perms + --raw + --time + --help + --version + " + COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) return 0 } complete -F _lsipc_module lsipc diff --git a/bash-completion/lsmem b/bash-completion/lsmem new file mode 100644 index 000000000..85cf3e01a --- /dev/null +++ b/bash-completion/lsmem @@ -0,0 +1,52 @@ +_lsmem_module() +{ + local cur prev OPTS + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + case $prev in + '-o'|'--output') + local prefix realcur OUTPUT_ALL OUTPUT + realcur="${cur##*,}" + prefix="${cur%$realcur}" + OUTPUT_ALL='RANGE SIZE STATE REMOVABLE BLOCK NODE' + for WORD in $OUTPUT_ALL; do + if ! [[ $prefix == *"$WORD"* ]]; then + OUTPUT="$WORD $OUTPUT" + fi + done + compopt -o nospace + COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- "$realcur") ) + return 0 + ;; + '-s'|'--sysroot') + local IFS=$'\n' + compopt -o filenames + COMPREPLY=( $(compgen -o dirnames -- ${cur:-"/"}) ) + return 0 + ;; + '--summary') + COMPREPLY=( $(compgen -W "never always only" -- $cur) ) + return 0 + ;; + '-h'|'--help'|'-V'|'--version') + return 0 + ;; + esac + OPTS=" + --json + --pairs + --all + --bytes + --noheadings + --output + --raw + --sysroot + --summary + --help + --version + " + COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) + return 0 +} +complete -F _lsmem_module lsmem diff --git a/bash-completion/lsns b/bash-completion/lsns index 8e6a335e4..8cf0a31f9 100644 --- a/bash-completion/lsns +++ b/bash-completion/lsns @@ -26,7 +26,7 @@ _lsns_module() return 0 ;; '-t'|'--type') - COMPREPLY=( $(compgen -W "mnt net ipc user pid uts" -- $cur) ) + COMPREPLY=( $(compgen -W "mnt net ipc user pid uts cgroup" -- $cur) ) return 0 ;; '-h'|'--help'|'-V'|'--version') diff --git a/bash-completion/mount b/bash-completion/mount index e4a98adf6..9a3391339 100644 --- a/bash-completion/mount +++ b/bash-completion/mount @@ -6,25 +6,20 @@ _mount_module() prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in '-t'|'--types') - local TYPES + local prefix realcur TYPES TYPES=" -adfs noadfs hfsplus nohfsplus smbfs nosmbfs -affs noaffs hpfs nohpfs squashfs nosquashfs -autofs noautofs iso9660 noiso9660 sysv nosysv -cifs nocifs jfs nojfs tmpfs notmpfs -coda nocoda minix nominix ubifs noubifs -coherent nocoherent msdos nomsdos udf noudf -cramfs nocramfs ncpfs noncpfs ufs noufs -debugfs nodebugfs nfs nonfs umsdos noumsdos -devpts nodevpts nfs4 nonfs4 usbfs nousbfs -efs noefs ntfs nontfs vfat novfat - proc noproc xenix noxenix -ext2 noext2 qnx4 noqnx4 xfs noxfs -ext3 noext3 ramfs noramfs -ext4 noext4 reiserfs noreiserfs -hfs nohfs romfs noromfs -" - COMPREPLY=( $(compgen -W "$TYPES" -- $cur) ) + $(\ls /lib/modules/$(uname -r)/kernel/fs | awk '{print $1, "no" $1}') + $(awk '{print $NF, "no" $NF}' /proc/filesystems) + " + realcur="${cur##*,}" + prefix="${cur%$realcur}" + for WORD in $TYPES; do + if ! [[ $prefix == *"$WORD"* ]]; then + TYPE_COLS="$WORD $TYPE_COLS" + fi + done + compopt -o nospace + COMPREPLY=( $(compgen -P "$prefix" -W "$TYPE_COLS" -S ',' -- $realcur) ) return 0 ;; '-L'|'--label') diff --git a/bash-completion/mountpoint b/bash-completion/mountpoint index f74efc9cc..f14327ce2 100644 --- a/bash-completion/mountpoint +++ b/bash-completion/mountpoint @@ -5,10 +5,6 @@ _mountpoint_module() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in - '-f'|'--fixme') - COMPREPLY=( $(compgen -W "fixme" -- $cur) ) - return 0 - ;; '-h'|'--help'|'-V'|'--version') return 0 ;; diff --git a/bash-completion/nsenter b/bash-completion/nsenter index 268f3782c..ceea61001 100644 --- a/bash-completion/nsenter +++ b/bash-completion/nsenter @@ -5,6 +5,14 @@ _nsenter_module() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in + '-S'|'--uid') + COMPREPLY=( $(compgen -W "uid" -- $cur) ) + return 0 + ;; + '-G'|'--gid') + COMPREPLY=( $(compgen -W "gid" -- $cur) ) + return 0 + ;; '-t'|'--target') local PIDS PIDS=$(for I in /proc/[0-9]*; do echo ${I##"/proc/"}; done) @@ -24,18 +32,25 @@ _nsenter_module() cur=${cur#=} ;; -*) - OPTS="--target + OPTS=" + --all + --target --mount= --uts= --ipc= --net= --pid= + --cgroup= --user= + --setuid + --setgid + --preserve-credentials --root= --wd= --no-fork --help - --version" + --version + " COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) return 0 ;; diff --git a/bash-completion/rtcwake b/bash-completion/rtcwake index 23c774c1f..cdee2f3d3 100644 --- a/bash-completion/rtcwake +++ b/bash-completion/rtcwake @@ -5,6 +5,12 @@ _rtcwake_module() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in + '-A'|'--adjfile') + local IFS=$'\n' + compopt -o filenames + COMPREPLY=( $(compgen -f -- $cur) ) + return 0 + ;; '-d'|'--device') local RTC_DEVS RTC_DEVS=$(cd /sys/class/rtc/ && echo *) @@ -31,17 +37,22 @@ _rtcwake_module() return 0 ;; esac - OPTS=" --date + OPTS=" + --auto + --adjfile + --date --device --dry-run --local + --list-modes --mode --seconds --time --utc --verbose --help - --version" + --version + " COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) return 0 } diff --git a/bash-completion/setarch b/bash-completion/setarch index 771de98d8..4496e97df 100644 --- a/bash-completion/setarch +++ b/bash-completion/setarch @@ -15,21 +15,24 @@ _setarch_module() fi case $cur in -*) - OPTS="--verbose - --addr-no-randomize - --fdpic-funcptrs - --mmap-page-zero - --addr-compat-layout - --read-implies-exec + OPTS=" --32bit + --fdpic-funcptrs --short-inode + --addr-compat-layout + --addr-no-randomize --whole-seconds --sticky-timeouts + --read-implies-exec + --mmap-page-zero --3gb --4gb --uname-2.6 + --verbose + --list --help - --version" + --version + " COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) return 0 ;; diff --git a/bash-completion/setsid b/bash-completion/setsid index 568159bda..955ec27c0 100644 --- a/bash-completion/setsid +++ b/bash-completion/setsid @@ -11,7 +11,7 @@ _setsid_module() esac case $cur in -*) - OPTS="--ctty --help --version" + OPTS="--ctty --wait --help --version" COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) return 0 ;; diff --git a/bash-completion/umount b/bash-completion/umount index ecf78ec5e..d76cb9fff 100644 --- a/bash-completion/umount +++ b/bash-completion/umount @@ -8,22 +8,9 @@ _umount_module() '-t'|'--types') local TYPES TYPES=" -adfs noadfs hfsplus nohfsplus smbfs nosmbfs -affs noaffs hpfs nohpfs squashfs nosquashfs -autofs noautofs iso9660 noiso9660 sysv nosysv -cifs nocifs jfs nojfs tmpfs notmpfs -coda nocoda minix nominix ubifs noubifs -coherent nocoherent msdos nomsdos udf noudf -cramfs nocramfs ncpfs noncpfs ufs noufs -debugfs nodebugfs nfs nonfs umsdos noumsdos -devpts nodevpts nfs4 nonfs4 usbfs nousbfs -efs noefs ntfs nontfs vfat novfat - proc noproc xenix noxenix -ext2 noext2 qnx4 noqnx4 xfs noxfs -ext3 noext3 ramfs noramfs -ext4 noext4 reiserfs noreiserfs -hfs nohfs romfs noromfs -" + $(\ls /lib/modules/$(uname -r)/kernel/fs | awk '{print $1, "no" $1}') + $(awk '{print $NF, "no" $NF}' /proc/filesystems) + " COMPREPLY=( $(compgen -W "$TYPES" -- $cur) ) return 0 ;; diff --git a/bash-completion/unshare b/bash-completion/unshare index 86a4af482..cd73c1d6c 100644 --- a/bash-completion/unshare +++ b/bash-completion/unshare @@ -5,6 +5,14 @@ _unshare_module() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" case $prev in + '--propagation') + COMPREPLY=( $(compgen -W "slave shared private unchanged" -- $cur) ) + return 0 + ;; + '-s'|'--setgroups') + COMPREPLY=( $(compgen -W "allow deny" -- $cur) ) + return 0 + ;; '-h'|'--help'|'-V'|'--version') return 0 ;; @@ -17,6 +25,12 @@ _unshare_module() --net --pid --user + --cgroup + --fork + --mount-proc + --map-root-user + --propagation + --setgroups --help --version" COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) diff --git a/bash-completion/zramctl b/bash-completion/zramctl index a4ef536d8..8c7767ce0 100644 --- a/bash-completion/zramctl +++ b/bash-completion/zramctl @@ -13,7 +13,9 @@ _zramctl_module() local prefix realcur OUTPUT_ALL OUTPUT realcur="${cur##*,}" prefix="${cur%$realcur}" - OUTPUT_ALL="NAME DISKSIZE DATA COMPR ALGORITHM STREAMS ZERO-PAGES TOTAL MOUNTPOINT" + OUTPUT_ALL="NAME DISKSIZE DATA COMPR ALGORITHM + STREAMS ZERO-PAGES TOTAL MEM-LIMIT MEM-USED + MIGRATED MOUNTPOINT" for WORD in $OUTPUT_ALL; do if ! [[ $prefix == *"$WORD"* ]]; then OUTPUT="$WORD $OUTPUT" |