[OpenWrt-Devel] [PATCH 2/3] tools/pkgconf: Run pkg-config wrapper through shellcheck

[Rosen Penev]

On Wed, Nov 27, 2019 at 2:30 PM Rosen Penev <rosenp at gmail.com> wrote:
>
> Mainly quoting fixes.
>
> Separated parameters by \ for easier readability.
>
> Switched to calling by dirname so that it can be called from any
> directory.
>
> Signed-off-by: Rosen Penev <rosenp at gmail.com>
> ---
>  tools/pkgconf/files/pkg-config | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tools/pkgconf/files/pkg-config b/tools/pkgconf/files/pkg-config
> index 82cc74ffcb..4b5e57b39f 100755
> --- a/tools/pkgconf/files/pkg-config
> +++ b/tools/pkgconf/files/pkg-config
> @@ -1,3 +1,6 @@
>  #!/bin/sh
>
> -pkg-config.real --define-variable=prefix=${STAGING_PREFIX} --define-variable=exec_prefix=${STAGING_PREFIX} --define-variable=bindir=${STAGING_PREFIX}/bin $@
> +"$(dirname "$0")pkg-config.real" \
AGH. This is totally wrong. I goofed while rebasing this. It should
have a / after dirname. Should I resend?
> +--define-variable=prefix="${STAGING_PREFIX}" \
> +--define-variable=exec_prefix="${STAGING_PREFIX}" \
> +--define-variable=bindir="${STAGING_PREFIX}/bin" "$@"
> --
> 2.23.0
>

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel