From: Koichi Murase <myoga.murase@gmail.com>
Date: Sun, 1 Jun 2025 20:14:52 +0000 (+0900)
Subject: bash-completion: prefer "command lsblk" to "lsblk" to avoid aliases
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b28c88d5d2e2432f677a945c931ea58283d808fd;p=thirdparty%2Futil-linux.git

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 b7e93d102..38aa05cef 100644
--- 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 fb98c405d..887dfea12 100644
--- 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 581a90d3d..ce122b3d9 100644
--- 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 cc9352730..737a83a3d 100644
--- 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 30eeff529..f37cf034d 100644
--- 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 3772ba430..0a57d68a6 100644
--- 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 385581208..12a7e37e7 100644
--- 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 c42c329bd..0734ab310 100644
--- 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 5297b863f..a536f7ea3 100644
--- 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 16ae9bde8..8e6942c67 100644
--- 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 bf00505b0..c6fb1d275 100644
--- 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 99cbf0df1..9c90dcd4d 100644
--- 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 7f9d962ae..1f0dd4e68 100644
--- 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 4f590519f..b7efc767f 100644
--- 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 fa74d4c11..b7e92fce7 100644
--- 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 e9413f7a9..e7a26cd0a 100644
--- 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 71ae77ede..6614884fe 100644
--- 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 a29f81010..430d61d8b 100644
--- 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 2430e40fe..30c9c688d 100644
--- 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 63ca5336b..d980bb45a 100644
--- 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 4dc57c4ea..27f64c602 100644
--- 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 093710590..ae74fef5d 100644
--- 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 de172725b..4c1fb4af7 100644
--- 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