Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

helpers/envkernel.sh: fix shellcheck disabled tests (MR 2072)

Browse source 
Shellcheck 0.7.2 has a change that gives many error conditions their own
SC30** codes, instead of including them in SC2039. This updates the
scripts in this package that "disable SC2039" to disable the new code.

New codes added in shellcheck: cfd68ee0c2ebfd0ab08a1d4bf628162b454dc207

[ci:skip-build] already built successfully in CI
This commit is contained in:
Clayton Craft 2021-06-18 17:02:58 -07:00
parent 5afc2e626f
commit 76489653df
No known key found for this signature in database
GPG key ID: 7A3461CA187CEA54
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
helpers/envkernel.sh
View file

@ -44,7 +44,7 @@ export_pmbootstrap_dir() {
# Get pmbootstrap dir based on this script's location # Get pmbootstrap dir based on this script's location
# See also: <https://stackoverflow.com/a/29835459> # See also: <https://stackoverflow.com/a/29835459>
# shellcheck disable=SC2039 # shellcheck disable=SC3054
if [ -n "${BASH_SOURCE[0]}" ]; then if [ -n "${BASH_SOURCE[0]}" ]; then
script_dir="$(dirname "${BASH_SOURCE[0]}")" script_dir="$(dirname "${BASH_SOURCE[0]}")"
else else
@ -114,7 +114,7 @@ initialize_chroot() {
host_arch="$(uname -m)" host_arch="$(uname -m)"
need_cross_compiler=1 need_cross_compiler=1
# Match arm* architectures # Match arm* architectures
# shellcheck disable=SC2039 # shellcheck disable=SC3057
arch_substr="${host_arch:0:3}" arch_substr="${host_arch:0:3}"
if [ "$arch" = "$host_arch" ] || \ if [ "$arch" = "$host_arch" ] || \
{ [ "$arch_substr" = "arm" ] && [ "$arch_substr" = "$arch" ]; }; then { [ "$arch_substr" = "arm" ] && [ "$arch_substr" = "$arch" ]; }; then
@ -194,7 +194,7 @@ create_output_folder() {
set_alias_make() { set_alias_make() {
# Cross compiler prefix # Cross compiler prefix
# shellcheck disable=SC1090 # shellcheck disable=SC1091
prefix="$(CBUILD="$deviceinfo_arch" . "$chroot/usr/share/abuild/functions.sh"; prefix="$(CBUILD="$deviceinfo_arch" . "$chroot/usr/share/abuild/functions.sh";
arch_to_hostspec "$deviceinfo_arch")" arch_to_hostspec "$deviceinfo_arch")"
@ -315,7 +315,7 @@ check_and_deactivate() {
print_usage() { print_usage() {
# shellcheck disable=SC2039 # shellcheck disable=SC3054
if [ -n "${BASH_SOURCE[0]}" ]; then if [ -n "${BASH_SOURCE[0]}" ]; then
echo "usage: source $(basename "${BASH_SOURCE[0]}")" echo "usage: source $(basename "${BASH_SOURCE[0]}")"
else else