[openwrt/openwrt] base-files/functions.sh: use command -v instead of which

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 11 09:55:00 EDT 2020


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8e6f2c029f72d79d263290a415dc8063307a9a42

commit 8e6f2c029f72d79d263290a415dc8063307a9a42
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Fri Jan 17 14:38:19 2020 -0800

    base-files/functions.sh: use command -v instead of which
    
    which must be executed. command -v is a shell builtin.
    
    https://github.com/koalaman/shellcheck/wiki/SC2230
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 package/base-files/files/lib/functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index a77b669709..323e057451 100755
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -176,7 +176,7 @@ default_prerm() {
 		ret=$?
 	fi
 
-	local shell="$(which bash)"
+	local shell="$(command -v bash)"
 	for i in $(grep -s "^/etc/init.d/" "$root/usr/lib/opkg/info/${pkgname}.list"); do
 		if [ -n "$root" ]; then
 			${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" disable
@@ -264,7 +264,7 @@ default_postinst() {
 		rm -f /tmp/luci-indexcache
 	fi
 
-	local shell="$(which bash)"
+	local shell="$(command -v bash)"
 	for i in $(grep -s "^/etc/init.d/" "$root$filelist"); do
 		if [ -n "$root" ]; then
 			${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" enable



More information about the lede-commits mailing list