[openwrt/openwrt] scripts: run ipkg-make-index through shellcheck

LEDE Commits lede-commits at lists.infradead.org
Tue May 9 13:54:55 PDT 2023


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/e6aa1a70e6c870cfeac838b52ad57b6888e6629d

commit e6aa1a70e6c870cfeac838b52ad57b6888e6629d
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Tue May 9 19:06:23 2023 +0200

    scripts: run ipkg-make-index through shellcheck
    
    Use quotes and replace `` by $() to pass the shellcheck tests.
    
    Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 scripts/ipkg-make-index.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/ipkg-make-index.sh b/scripts/ipkg-make-index.sh
index 8965d0aa18..7b209dca8e 100755
--- a/scripts/ipkg-make-index.sh
+++ b/scripts/ipkg-make-index.sh
@@ -3,25 +3,25 @@ set -e
 
 pkg_dir=$1
 
-if [ -z $pkg_dir ] || [ ! -d $pkg_dir ]; then
+if [ -z "$pkg_dir" ] || [ ! -d "$pkg_dir" ]; then
 	echo "Usage: ipkg-make-index <package_directory>" >&2
 	exit 1
 fi
 
 empty=1
 
-for pkg in `find $pkg_dir -name '*.ipk' | sort`; do
+for pkg in $(find "$pkg_dir" -name '*.ipk' | sort); do
 	empty=
 	name="${pkg##*/}"
 	name="${name%%_*}"
 	[[ "$name" = "kernel" ]] && continue
 	[[ "$name" = "libc" ]] && continue
 	echo "Generating index for package $pkg" >&2
-	file_size=$(stat -L -c%s $pkg)
-	sha256sum=$($MKHASH sha256 $pkg)
+	file_size=$(stat -L -c%s "$pkg")
+	sha256sum=$($MKHASH sha256 "$pkg")
 	# Take pains to make variable value sed-safe
-	sed_safe_pkg=`echo $pkg | sed -e 's/^\.\///g' -e 's/\\//\\\\\\//g'`
-	tar -xzOf $pkg ./control.tar.gz | tar xzOf - ./control | sed -e "s/^Description:/Filename: $sed_safe_pkg\\
+	sed_safe_pkg=$(echo "$pkg" | sed -e 's/^\.\///g' -e 's/\\//\\\\\\//g')
+	tar -xzOf "$pkg" ./control.tar.gz | tar xzOf - ./control | sed -e "s/^Description:/Filename: $sed_safe_pkg\\
 Size: $file_size\\
 SHA256sum: $sha256sum\\
 Description:/"




More information about the lede-commits mailing list