nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2368 from freifunk-gluon/lint-sh-fixes

Browse Source 
lint-sh fixes
This commit is contained in:
Matthias Schiffer 2022-02-03 16:37:18 +01:00 committed by GitHub
commit db80146093
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/push_pkg.sh
View File

@ -48,7 +48,7 @@ shift $(( OPTIND - 1 ))
if [ "$build_only" -eq 0 ]; then if [ "$build_only" -eq 0 ]; then
remote_info=$(ssh -p "${ssh_port}" "root@${ssh_host}" ' remote_info=$(ssh -p "${ssh_port}" "root@${ssh_host}" '
source /etc/os-release source /etc/os-release
printf "%s\t%s\n" "$OPENWRT_BOARD" "$OPENWRT_ARCH" printf "%s\\t%s\\n" "$OPENWRT_BOARD" "$OPENWRT_ARCH"
') ')
REMOTE_OPENWRT_BOARD="$(echo "$remote_info" | cut -f 1)" REMOTE_OPENWRT_BOARD="$(echo "$remote_info" | cut -f 1)"
REMOTE_OPENWRT_ARCH="$(echo "$remote_info" | cut -f 2)" REMOTE_OPENWRT_ARCH="$(echo "$remote_info" | cut -f 2)"
@ -92,7 +92,7 @@ while [ $# -gt 0 ]; do
opkg_packages="$(make TOPDIR="${topdir}" -C "${pkgdir}" DUMP=1 | awk '/^Package: / { print $2 }')" opkg_packages="$(make TOPDIR="${topdir}" -C "${pkgdir}" DUMP=1 | awk '/^Package: / { print $2 }')"
search_package() { search_package() {
find "$2" -name "$1_*.ipk" -printf "%f\n" find "$2" -name "$1_*.ipk" -printf '%f\n'
} }
make TOPDIR="${topdir}" -C "${pkgdir}" clean make TOPDIR="${topdir}" -C "${pkgdir}" clean

2
scripts/lint-sh.sh
View File

@ -17,7 +17,7 @@ find package -type f | while read -r file; do
is_scriptfile "$file" || continue is_scriptfile "$file" || continue
echo "Checking $file" echo "Checking $file"
shellcheck -f gcc -x -s sh -e SC2039,SC1091,SC2155,SC2034 "$file" shellcheck -f gcc -x -s sh -e SC2039,SC1091,SC2155,SC2034,SC3043,SC3037,SC3057 "$file"
done done
find scripts -type f | while read -r file; do find scripts -type f | while read -r file; do