bash-completion: prefer "command lsblk" to "lsblk" to avoid aliases

The user may define an alias lsblk to specify the default formatting,
such as -T, which would conflict with lsblk -r used in the Bash
completion settings. In the Bash completion settings, to prevent the
calls of lsblk -r ... from being replaced with lsblk -T -r ... and
failing, lsblk should be called using command lsblk.

diff --git a/bash-completion/addpart b/bash-completion/addpart
index b7e93d10297f1e9fbe688b53d576cbdbd71edbb5..38aa05cef6c52ccea7a05616c1af6c0e2d827d60 100644 (file)
--- a/bash-completion/addpart
+++ b/bash-completion/addpart
@@ -5,7 +5,7 @@ _addpart_module()
        cur="${COMP_WORDS[COMP_CWORD]}"
        case $COMP_CWORD in
                1)
-                       OPTS="--help --version $(lsblk -pnro name)"
+                       OPTS="--help --version $(command lsblk -pnro name)"
                        compopt -o bashdefault -o default
                        COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
                        ;;

diff --git a/bash-completion/blkdiscard b/bash-completion/blkdiscard
index fb98c405dc2755b791ff1d483cae6187e986ddac..887dfea121bc9c3171f8edf0415f52d940757207 100644 (file)
--- a/bash-completion/blkdiscard
+++ b/bash-completion/blkdiscard
@@ -32,7 +32,7 @@ _blkdiscard_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _blkdiscard_module blkdiscard

diff --git a/bash-completion/blkid b/bash-completion/blkid
index 581a90d3d2f55ba7009f842b2724ba63968ea441..ce122b3d951ddbc929766cee88b9430974576fa5 100644 (file)
--- a/bash-completion/blkid
+++ b/bash-completion/blkid
@@ -94,7 +94,7 @@ _blkid_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _blkid_module blkid

diff --git a/bash-completion/blkzone b/bash-completion/blkzone
index cc9352730d811e862662ee32b71d48ede4c69ac1..737a83a3dc6999be4e3e3431b330757b1c535f1c 100644 (file)
--- a/bash-completion/blkzone
+++ b/bash-completion/blkzone
@@ -47,7 +47,7 @@ _blkzone_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _blkzone_module blkzone

diff --git a/bash-completion/blockdev b/bash-completion/blockdev
index 30eeff5299602adfb01ca8ebf04b6ee4539729ca..f37cf034d8b7a6a37e804d3f776c8a86d9368b6e 100644 (file)
--- a/bash-completion/blockdev
+++ b/bash-completion/blockdev
@@ -4,7 +4,7 @@ _blockdev_module()
        COMPREPLY=()
        cur="${COMP_WORDS[COMP_CWORD]}"
        prev="${COMP_WORDS[COMP_CWORD-1]}"
-       DEVS="$(lsblk -pnro name)"
+       DEVS="$(command lsblk -pnro name)"
        OPTS="-h -V -q
                --report
                --getsz

diff --git a/bash-completion/cfdisk b/bash-completion/cfdisk
index 3772ba4307ab7f3951582d8a3ca22416f9b4c2f6..0a57d68a644cd65c92d7517749b8069ff173eb12 100644 (file)
--- a/bash-completion/cfdisk
+++ b/bash-completion/cfdisk
@@ -26,7 +26,7 @@ _cfdisk_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _cfdisk_module cfdisk

diff --git a/bash-completion/delpart b/bash-completion/delpart
index 3855812089a2438020d7db071e36194c41b2bcd2..12a7e37e7a7b8b5a14ddce8d137aa03c59cf0d7c 100644 (file)
--- a/bash-completion/delpart
+++ b/bash-completion/delpart
@@ -11,7 +11,7 @@ _delpart_module()
        esac
        case $COMP_CWORD in
                1)
-                       OPTS="--help --version $(lsblk -pnro name)"
+                       OPTS="--help --version $(command lsblk -pnro name)"
                        compopt -o bashdefault -o default
                        COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
                        ;;

diff --git a/bash-completion/fdisk b/bash-completion/fdisk
index c42c329bdea382433e2af3db3b2cfe252c1494ac..0734ab310fcd236a965f858ecdfedcef62ebd6cc 100644 (file)
--- a/bash-completion/fdisk
+++ b/bash-completion/fdisk
@@ -6,7 +6,7 @@ _fdisk_module()
        prev="${COMP_WORDS[COMP_CWORD-1]}"
        case $prev in
                '-s'|'--getsz')
-                       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+                       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
                        return 0
                        ;;
                '-b'|'--sector-size')
@@ -95,7 +95,7 @@ _fdisk_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _fdisk_module fdisk

diff --git a/bash-completion/findfs b/bash-completion/findfs
index 5297b863f91a81458e3fde5992f2fd15db2a28ce..a536f7ea3141965897fb2ff1a408b931f39def66 100644 (file)
--- a/bash-completion/findfs
+++ b/bash-completion/findfs
@@ -16,16 +16,16 @@ _findfs_module()
                        return 0
                        ;;
        esac
-       for i in $(lsblk -rpno label); do
+       for i in $(command lsblk -rpno label); do
                findable+=" LABEL=$i"
        done
-       for i in $(lsblk -rpno uuid); do
+       for i in $(command lsblk -rpno uuid); do
                findable+=" UUID=$i"
        done
-       for i in $(lsblk -rpno partlabel); do
+       for i in $(command lsblk -rpno partlabel); do
                findable+=" PARTLABEL=$i"
        done
-       for i in $(lsblk -rpno partuuid); do
+       for i in $(command lsblk -rpno partuuid); do
                findable+=" PARTUUID=$i"
        done
        COMPREPLY=( $(compgen -W "$findable" -- $cur) )

diff --git a/bash-completion/fsck b/bash-completion/fsck
index 16ae9bde8ccd3d2ba4dca42da820bb2db36eba05..8e6942c672e7a4c6704eca5906a71036799006f1 100644 (file)
--- a/bash-completion/fsck
+++ b/bash-completion/fsck
@@ -33,7 +33,7 @@ _fsck_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _fsck_module fsck

diff --git a/bash-completion/fsck.cramfs b/bash-completion/fsck.cramfs
index bf00505b01db80701a7350c5f60f70139490d0fa..c6fb1d27595f1d42e585fbeb729b2725bc9fdcd2 100644 (file)
--- a/bash-completion/fsck.cramfs
+++ b/bash-completion/fsck.cramfs
@@ -26,7 +26,7 @@ _fsck.cramfs_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _fsck.cramfs_module fsck.cramfs

diff --git a/bash-completion/fsck.minix b/bash-completion/fsck.minix
index 99cbf0df17dabc3fe78e01af5aa90679f93a923e..9c90dcd4d8c26ebd7f9e877864c41f1ca3636bea 100644 (file)
--- a/bash-completion/fsck.minix
+++ b/bash-completion/fsck.minix
@@ -11,7 +11,7 @@ _fsck.minix_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _fsck.minix_module fsck.minix

diff --git a/bash-completion/mkfs b/bash-completion/mkfs
index 7f9d962aee81e823552bea27bcebba80d2c51446..1f0dd4e6821e0464b92f241487458cb3067f8211 100644 (file)
--- a/bash-completion/mkfs
+++ b/bash-completion/mkfs
@@ -22,7 +22,7 @@ _mkfs_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _mkfs_module mkfs

diff --git a/bash-completion/mkfs.bfs b/bash-completion/mkfs.bfs
index 4f590519ffb05d1ca8c45ba29fe93490b9670ad6..b7efc767f4a181556b524366857fb5d514cee2d8 100644 (file)
--- a/bash-completion/mkfs.bfs
+++ b/bash-completion/mkfs.bfs
@@ -25,7 +25,7 @@ _mkfs.bfs_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _mkfs.bfs_module mkfs.bfs

diff --git a/bash-completion/mkfs.cramfs b/bash-completion/mkfs.cramfs
index fa74d4c113686e3968660b7b5a6516454e5fafbe..b7e92fce74c9c3c8dba93c7f02289ebcd2380766 100644 (file)
--- a/bash-completion/mkfs.cramfs
+++ b/bash-completion/mkfs.cramfs
@@ -37,7 +37,7 @@ _mkfs.cramfs_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _mkfs.cramfs_module mkfs.cramfs

diff --git a/bash-completion/mkfs.minix b/bash-completion/mkfs.minix
index e9413f7a9b930ccaf9620bebbfb1b6cd5f91c003..e7a26cd0a7adffdcbea1d3fc475bd274e11bcf20 100644 (file)
--- a/bash-completion/mkfs.minix
+++ b/bash-completion/mkfs.minix
@@ -27,7 +27,7 @@ _mkfs.minix_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _mkfs.minix_module mkfs.minix

diff --git a/bash-completion/mkswap b/bash-completion/mkswap
index 71ae77ede6f926882699bd16fe0f873ed7e44c1c..6614884fe0e88b64b703f5906643eb0619ce3d80 100644 (file)
--- a/bash-completion/mkswap
+++ b/bash-completion/mkswap
@@ -41,7 +41,7 @@ _mkswap_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _mkswap_module mkswap

diff --git a/bash-completion/mount b/bash-completion/mount
index a29f81010addf651ca081fda8e9ce3258046b65c..430d61d8bc9e37648fb6f8042ade73e3def764aa 100644 (file)
--- a/bash-completion/mount
+++ b/bash-completion/mount
@@ -24,13 +24,13 @@ _mount_module()
                        ;;
                '-L'|'--label')
                        local LABELS
-                       LABELS="$(lsblk -o LABEL -nr)"
+                       LABELS="$(command lsblk -o LABEL -nr)"
                        COMPREPLY=( $(compgen -W "$LABELS" -- $cur) )
                        return 0
                        ;;
                '-U'|'--uuid')
                        local UUIDS
-                       UUIDS="$(lsblk -o UUID -nr)"
+                       UUIDS="$(command lsblk -o UUID -nr)"
                        COMPREPLY=( $(compgen -W "$UUIDS" -- $cur) )
                        return 0
                        ;;

diff --git a/bash-completion/partx b/bash-completion/partx
index 2430e40fec24a91564f9f0abfd36d580934fbc3d..30c9c688d32f31a81615657de8a0296c094bfc65 100644 (file)
--- a/bash-completion/partx
+++ b/bash-completion/partx
@@ -60,7 +60,7 @@ _partx_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _partx_module partx

diff --git a/bash-completion/resizepart b/bash-completion/resizepart
index 63ca5336b6bdebe399f81e9fe888e31d39682792..d980bb45a7de9b133ba59de8df2536423b61254b 100644 (file)
--- a/bash-completion/resizepart
+++ b/bash-completion/resizepart
@@ -11,7 +11,7 @@ _resizepart_module()
        esac
        case $COMP_CWORD in
                1)
-                       OPTS="--help --version $(lsblk -pnro name)"
+                       OPTS="--help --version $(command lsblk -pnro name)"
                        compopt -o bashdefault -o default
                        COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
                        ;;

diff --git a/bash-completion/sfdisk b/bash-completion/sfdisk
index 4dc57c4eaf1f36ea470e53c3499b69f70b27c8fa..27f64c6021a2888b11580d7cdc2d1b2557a56c19 100644 (file)
--- a/bash-completion/sfdisk
+++ b/bash-completion/sfdisk
@@ -7,7 +7,7 @@ _sfdisk_module()
        case $prev in
                '-d'|'--dump'|'-J'|'--json'|'-l'|'--list'|'-F'|'--list-free'|'-r'|'--reorder'|'-s'|'--show-size'|'-V'|'--verify'|'-A'|'--activate'|'--delete')
                        compopt -o bashdefault -o default
-                       COMPREPLY=( $(compgen -W "$(lsblk -dpnro name)" -- $cur) )
+                       COMPREPLY=( $(compgen -W "$(command lsblk -dpnro name)" -- $cur) )
                        return 0
                        ;;
                '-N'|'--partno')
@@ -97,7 +97,7 @@ _sfdisk_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _sfdisk_module sfdisk

diff --git a/bash-completion/swapon b/bash-completion/swapon
index 093710590c9fac9cb199fae67daca5ae751947bc..ae74fef5d5047fb7849538dfe4e74bb96e726cd4 100644 (file)
--- a/bash-completion/swapon
+++ b/bash-completion/swapon
@@ -27,25 +27,25 @@ _swapon_module()
                        ;;
                '-U'|'UUID=')
                        local UUIDS
-                       UUIDS="$(lsblk -nrp -o FSTYPE,UUID | awk '$1 ~ /swap/ { print $2 }')"
+                       UUIDS="$(command lsblk -nrp -o FSTYPE,UUID | awk '$1 ~ /swap/ { print $2 }')"
                        COMPREPLY=( $(compgen -W "$UUIDS" -- $cur) )
                        return 0
                        ;;
                '-L'|'LABEL=')
                        local LABELS
-                       LABELS="$(lsblk -nrp -o FSTYPE,LABEL | awk '$1 ~ /swap/ { print $2 }')"
+                       LABELS="$(command lsblk -nrp -o FSTYPE,LABEL | awk '$1 ~ /swap/ { print $2 }')"
                        COMPREPLY=( $(compgen -W "$LABELS" -- $cur) )
                        return 0
                        ;;
                'PARTUUID=')
                        local PARTUUIDS
-                       PARTUUIDS="$(lsblk -nrp -o FSTYPE,PARTUUID | awk '$1 ~ /swap/ { print $2 }')"
+                       PARTUUIDS="$(command lsblk -nrp -o FSTYPE,PARTUUID | awk '$1 ~ /swap/ { print $2 }')"
                        COMPREPLY=( $(compgen -W "$PARTUUIDS" -- $cur) )
                        return 0
                        ;;
                'PARTLABEL=')
                        local PARTLABELS
-                       PARTLABELS="$(lsblk -nrp -o FSTYPE,PARTLABEL | awk '$1 ~ /swap/ { print $2 }')"
+                       PARTLABELS="$(command lsblk -nrp -o FSTYPE,PARTLABEL | awk '$1 ~ /swap/ { print $2 }')"
                        COMPREPLY=( $(compgen -W "$PARTLABELS" -- $cur) )
                        return 0
                        ;;
@@ -77,7 +77,7 @@ _swapon_module()
                        ;;
        esac
        local DEVS
-       DEVS="$(lsblk -nrp -o FSTYPE,NAME | awk '$1 ~ /swap/ { print $2 }')"
+       DEVS="$(command lsblk -nrp -o FSTYPE,NAME | awk '$1 ~ /swap/ { print $2 }')"
        compopt -o nospace
        COMPREPLY=( $(compgen -fW "$DEVS LABEL= UUID= PARTLABEL= PARTUUID=" -- $cur) )
        return 0

diff --git a/bash-completion/wipefs b/bash-completion/wipefs
index de172725b11ef6614a1fe55f0ed91abe5adf9f2a..4c1fb4af700a26a3136723c3d22585a500158013 100644 (file)
--- a/bash-completion/wipefs
+++ b/bash-completion/wipefs
@@ -60,7 +60,7 @@ _wipefs_module()
                        ;;
        esac
        compopt -o bashdefault -o default
-       COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$(command lsblk -pnro name)" -- $cur) )
        return 0
 }
 complete -F _wipefs_module wipefs