[Buildroot] [PATCH/master 2/7] g-ir-scanner-qemuwrapper.in: Fix shellcheck warnings, switch to sh
Arnout Vandecappelle
arnout at mind.be
Sat Sep 11 18:57:04 UTC 2021
On 03/09/2021 18:20, Adam Duskett wrote:
> - Add double quotes to prevent globbing and word splitting.
> - Add indentations of continuation lines.
> - Disable SC2181 and SC2016 as we explicitly do not want the variables
> expanded in the echo.
>
> Signed-off-by: Adam Duskett <aduskett at gmail.com>
> ---
> .../g-ir-scanner-qemuwrapper.in | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
> index ec066062e2..5ece75d0a4 100644
> --- a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
> +++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
> @@ -1,18 +1,20 @@
> -#!/usr/bin/env bash
> +#!/usr/bin/env sh
>
> -# Pass -r to qemu-user as to trick glibc into not errorings out if the host kernel
> +# Pass -r to qemu-user as to trick glibc into not erroring out if the host kernel
> # is older than the target kernel.
> # Use a modules directory which does not exist so we don't load random things
> # which may then get deleted (or their dependencies) and potentially segfault
> GOI_LIBRARY_PATH="${GIR_EXTRA_LIBS_PATH:+${GIR_EXTRA_LIBS_PATH}:}.libs:$(dirname "$0")/../lib:$(dirname "$0")/../../lib"
> -GIO_MODULE_DIR=$(dirname $0)/../lib/gio/modules-dummy \
> +GIO_MODULE_DIR="$(dirname "$0")/../lib/gio/modules-dummy" \
> @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \
> --L $(dirname $0)/../../ \
> --E LD_LIBRARY_PATH="${GOI_LIBRARY_PATH}" \
> -"$@"
> + -L "$(dirname "$0")/../../" \
> + -E LD_LIBRARY_PATH="${GOI_LIBRARY_PATH}" \
> + "$@"
>
> -if [[ $? -ne 0 ]]; then
> +# shellcheck disable=SC2181
Instead of adding an exception, we could just do the right thing:
if ! @QEMU_USER@ -r ... \
... \
then
...
But since I wasn't going to test this change, I left it as is.
Regards,
Arnout
> +if [ $? -ne 0 ]; then
> echo "If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help."
> + # shellcheck disable=SC2016
> echo 'Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs"'
> exit 1
> fi
>
More information about the buildroot
mailing list