aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2017-01-24 20:52:42 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2017-01-24 20:52:42 +0100
commitbca4ea8b68403e6f751341b82c65937f14590679 (patch)
tree21c637e653ceaa259599cecf8fb57a9de8ad6172
parent89193f985bf50af702e0f98a3c86573277c03287 (diff)
downloadbusybox-bca4ea8b68403e6f751341b82c65937f14590679.tar.gz
busybox-bca4ea8b68403e6f751341b82c65937f14590679.tar.bz2
remove "local" bashism from a few scripts
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rwxr-xr-xexamples/depmod2
-rwxr-xr-xscripts/gen_build_files.sh4
-rwxr-xr-xscripts/trylink14
-rwxr-xr-xtestsuite/runtest10
4 files changed, 15 insertions, 15 deletions
diff --git a/examples/depmod b/examples/depmod
index d769590d0..8d421c6ab 100755
--- a/examples/depmod
+++ b/examples/depmod
@@ -7,7 +7,7 @@
# Licensed under GPLv2, see file LICENSE in this source tree.
#
-local BASE="${1:-/usr/lib/modules}"
+BASE="${1:-/usr/lib/modules}"
find "$BASE" -name '*.ko.gz' | while read I ; do
N=`basename "$I" '.ko.gz'`
diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
index ebee17c64..f79fa2f83 100755
--- a/scripts/gen_build_files.sh
+++ b/scripts/gen_build_files.sh
@@ -20,7 +20,9 @@ chk() { status "CHK" "$@"; }
generate()
{
# NB: data to be inserted at INSERT line is coming on stdin
- local src="$1" dst="$2" header="$3"
+ src="$1"
+ dst="$2"
+ header="$3"
#chk "${dst}"
{
# Need to use printf: different shells have inconsistent
diff --git a/scripts/trylink b/scripts/trylink
index c2a431626..9f288c141 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -46,8 +46,7 @@ try() {
}
check_cc() {
- local tempname="$(mktemp tmp.XXXXXXXXXX)"
- local r
+ tempname="$(mktemp tmp.XXXXXXXXXX)"
echo "int main(int argc,char**argv){return argv?argc:0;}" >"$tempname".c
# Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :(
# Was using "-xc /dev/null", but we need a valid C program.
@@ -55,14 +54,13 @@ check_cc() {
# '... -D"BB_VER=KBUILD_STR(1.N.M)" ...'
# and we need shell to process quotes!
$CC $CFLAGS $LDFLAGS $1 "$tempname".c -o "$tempname" >/dev/null 2>&1
- r=$?
+ exitcode=$?
rm -f "$tempname" "$tempname".c "$tempname".o
- return $r
+ return $exitcode
}
check_libc_is_glibc() {
- local tempname="$(mktemp tmp.XXXXXXXXXX)"
- local r
+ tempname="$(mktemp tmp.XXXXXXXXXX)"
echo "\
#include <stdlib.h>
/* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */
@@ -71,9 +69,9 @@ check_libc_is_glibc() {
#endif
" >"$tempname".c
! $CC $CFLAGS "$tempname".c -c -o "$tempname".o >/dev/null 2>&1
- r=$?
+ exitcode=$?
rm -f "$tempname" "$tempname".c "$tempname".o
- return $r
+ return $exitcode
}
EXE="$1"
diff --git a/testsuite/runtest b/testsuite/runtest
index 51575d926..44f9cd1a1 100755
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -12,12 +12,12 @@ total_failed=0
# Option -e will make testcase stop on the first failed command.
run_applet_testcase()
{
- local applet="$1"
- local testcase="$2"
+ applet="$1"
+ testcase="$2"
- local status=0
- local uc_applet=$(echo "$applet" | tr a-z A-Z)
- local testname="$testcase"
+ status=0
+ uc_applet=$(echo "$applet" | tr a-z A-Z)
+ testname="$testcase"
testname="${testname##*/}" # take basename
if grep "^# CONFIG_$uc_applet is not set$" "$bindir/.config" >/dev/null; then