diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-02-20 06:58:11 +0000 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-16 22:10:03 +0000 |
| commit | c55eb8a0c3ca5b8ed1081e7eb8a423563288fb58 (patch) | |
| tree | 6ea61f7291b27ce9e22b40c5593c6ab6f54555d2 /scripts/build/binary_loopback_cfg | |
| parent | af040d78035b88aaf2f99f38bf5f0db176c92d0a (diff) | |
| download | vyos-live-build-c55eb8a0c3ca5b8ed1081e7eb8a423563288fb58.tar.gz vyos-live-build-c55eb8a0c3ca5b8ed1081e7eb8a423563288fb58.zip | |
use local scope for private function vars
all vars affected have been carefully checked to be quite certain
that they are definitely local
where variable is assigned the return value of a function/command, the
local "declaration" is deliberately done on a separate line, since
`local FOO` is actually treated itself as a command rather than a
declaration; will thus always cause $? to be zero, and thus if done on
the same line as such an assignment can not only clobber $? but in doing
so unintentionally blocks failure of a command from triggering the
expected exit from having `set -e`.
also, from testing, i have found that when assigning "${@}" this must be
done on a separate line confusingly as otherwise an error occurs.
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_loopback_cfg')
| -rwxr-xr-x | scripts/build/binary_loopback_cfg | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg index 0b8af76a4..62681603a 100755 --- a/scripts/build/binary_loopback_cfg +++ b/scripts/build/binary_loopback_cfg @@ -66,11 +66,11 @@ Grub_live_entry () Grub_install_entry () { - LABEL="${1}" - TYPE="${2}" - KERNEL="${3}" - INITRD="${4}" - APPEND="${5}" + local LABEL="${1}" + local TYPE="${2}" + local KERNEL="${3}" + local INITRD="${4}" + local APPEND="${5}" # Drop "quiet" kernel parameter for expert entries case $TYPE in |