Hi Aaron,
Adding Freso to the CC since he is the original author of the fish
support.
On Tue, Mar 26, 2024 at 07:52:49PM -0400, Aaron Merey wrote:
> Fish does not support bracketed variables in scripts. Remove brackets
> from the variable ${prefix} in profile.fish before installation to
> prevent this error.
>
> Fish also raises an error for unmatched wildcards, except for special
> cases like the set command. Use a wildcard to match .urls files using
> the set command instead of cat to prevent an unmatched wildcard error
> when no .urls files are found.
Not knowing fish this looks OK to me. We might want a testcase like
the one that was just added for config/profile.sh to make sure we ship
something that runs correctly. Could be something as simple as:
type fish 2>/dev/null || (echo "no fish installed"; exit 77)
fish ${abs_top_builddir}/config/profile.fish
> Signed-off-by: Aaron Merey <ame...@redhat.com>
> ---
> config/Makefile.am | 1 +
> config/profile.fish.in | 3 ++-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/config/Makefile.am b/config/Makefile.am
> index ae14e625..fd41997f 100644
> --- a/config/Makefile.am
> +++ b/config/Makefile.am
> @@ -41,6 +41,7 @@ pkgconfig_DATA += libdebuginfod.pc
> install-data-local:
> $(INSTALL_DATA) profile.sh -D
> $(DESTDIR)$(sysconfdir)/profile.d/debuginfod.sh
> $(INSTALL_DATA) profile.csh -D
> $(DESTDIR)$(sysconfdir)/profile.d/debuginfod.csh
> + sed -i 's/{prefix}/prefix/g' profile.fish
> $(INSTALL_DATA) profile.fish -D
> $(DESTDIR)$(datadir)/fish/vendor_conf.d/debuginfod.fish
> mkdir -p $(DESTDIR)$(sysconfdir)/debuginfod
> if [ -n "@DEBUGINFOD_URLS@" ]; then \
> diff --git a/config/profile.fish.in b/config/profile.fish.in
> index 00e9ca59..c0a234db 100644
> --- a/config/profile.fish.in
> +++ b/config/profile.fish.in
> @@ -7,7 +7,8 @@
> if not set --query DEBUGINFOD_URLS
> # Use local variables so we don't need to manually unset them
> set --local prefix "@prefix@"
> - set --local DEBUGINFOD_URLS (cat /dev/null
> "@sysconfdir@/debuginfod"/*.urls 2>/dev/null | string replace '\n' ' ')
> + set --local files "@sysconfdir@/debuginfod/"*.urls
> + set --local DEBUGINFOD_URLS (cat /dev/null $files 2>/dev/null | string
> replace '\n' ' ')
> if test -n "$DEBUGINFOD_URLS"
> set --global --export DEBUGINFOD_URLS "$DEBUGINFOD_URLS"
> end
> --
> 2.43.0
>
