~olbohlen/oi-userland.git

parent: 19bf13d9 | patch | commit | ignore whitespace

Andreas Wacknitz

2024-01-01 c50e0f3178f5481dff1ca9dc06888004c5191dcf

fish: update to 3.7.0

5 files modified

	components/shell/fish/Makefile	4 ●●●●● patch \| view \| raw \| blame \| history
	components/shell/fish/fish.p5m	50 ●●●●● patch \| view \| raw \| blame \| history
	components/shell/fish/manifests/sample-manifest.p5m	50 ●●●●● patch \| view \| raw \| blame \| history
	components/shell/fish/patches/02-fix-reg.patch	11 ●●●●● patch \| view \| raw \| blame \| history
	components/shell/fish/test/results-all.master	1022 ●●●●● patch \| view \| raw \| blame \| history

 components/shell/fish/Makefile

@@ -21,12 +21,12 @@
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        fish
COMPONENT_VERSION=    3.6.4
COMPONENT_VERSION=    3.7.0
COMPONENT_SUMMARY=    Fish is a smart and user-friendly command line shell
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL=    https://fishshell.com
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH=    sha256:0f3f610e580de092fbe882c8aa76623ecf91bb16fdf0543241e6e90d5d4bc393
COMPONENT_ARCHIVE_HASH=    sha256:df1b7378b714f0690b285ed9e4e58afe270ac98dbc9ca5839589c1afcca33ab1
COMPONENT_ARCHIVE_URL=    https://github.com/fish-shell/fish-shell/releases/download/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=        shell/fish
COMPONENT_CLASSIFICATION=    System/Shells

 components/shell/fish/fish.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2023 <contributor>
# Copyright 2024 Andreas Wacknitz
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -85,6 +85,7 @@
file path=usr/share/doc/fish/cmds/fish_clipboard_paste.html
file path=usr/share/doc/fish/cmds/fish_command_not_found.html
file path=usr/share/doc/fish/cmds/fish_config.html
file path=usr/share/doc/fish/cmds/fish_default_key_bindings.html
file path=usr/share/doc/fish/cmds/fish_delta.html
file path=usr/share/doc/fish/cmds/fish_git_prompt.html
file path=usr/share/doc/fish/cmds/fish_greeting.html
@@ -101,6 +102,7 @@
file path=usr/share/doc/fish/cmds/fish_title.html
file path=usr/share/doc/fish/cmds/fish_update_completions.html
file path=usr/share/doc/fish/cmds/fish_vcs_prompt.html
file path=usr/share/doc/fish/cmds/fish_vi_key_bindings.html
file path=usr/share/doc/fish/cmds/for.html
file path=usr/share/doc/fish/cmds/funced.html
file path=usr/share/doc/fish/cmds/funcsave.html
@@ -175,6 +177,7 @@
file path=usr/share/doc/fish/language.html
file path=usr/share/doc/fish/license.html
file path=usr/share/doc/fish/objects.inv
file path=usr/share/doc/fish/prompt.html
file path=usr/share/doc/fish/relnotes.html
file path=usr/share/doc/fish/search.html
file path=usr/share/doc/fish/searchindex.js
@@ -201,6 +204,9 @@
file path=usr/share/fish/completions/adb.fish
file path=usr/share/fish/completions/adduser.fish
file path=usr/share/fish/completions/adiff.fish
file path=usr/share/fish/completions/age-keygen.fish
file path=usr/share/fish/completions/age.fish
file path=usr/share/fish/completions/airmon-ng.fish
file path=usr/share/fish/completions/alias.fish
file path=usr/share/fish/completions/als.fish
file path=usr/share/fish/completions/alsactl.fish
@@ -244,6 +250,7 @@
file path=usr/share/fish/completions/apt-zip-list.fish
file path=usr/share/fish/completions/apt.fish
file path=usr/share/fish/completions/aptitude.fish
file path=usr/share/fish/completions/ar.fish
file path=usr/share/fish/completions/arc.fish
file path=usr/share/fish/completions/archlinux-java.fish
file path=usr/share/fish/completions/arepack.fish
@@ -281,6 +288,7 @@
file path=usr/share/fish/completions/bind.fish
file path=usr/share/fish/completions/bison.fish
file path=usr/share/fish/completions/black.fish
file path=usr/share/fish/completions/blender.fish
file path=usr/share/fish/completions/block.fish
file path=usr/share/fish/completions/bluetoothctl.fish
file path=usr/share/fish/completions/bootctl.fish
@@ -296,6 +304,7 @@
file path=usr/share/fish/completions/bundle.fish
file path=usr/share/fish/completions/bunzip2.fish
file path=usr/share/fish/completions/busctl.fish
file path=usr/share/fish/completions/bws.fish
file path=usr/share/fish/completions/bzcat.fish
file path=usr/share/fish/completions/bzip2.fish
file path=usr/share/fish/completions/bzip2recover.fish
@@ -304,6 +313,7 @@
file path=usr/share/fish/completions/cabal.fish
file path=usr/share/fish/completions/caddy.fish
file path=usr/share/fish/completions/caffeinate.fish
file path=usr/share/fish/completions/calendar.fish
file path=usr/share/fish/completions/camcontrol.fish
file path=usr/share/fish/completions/cancel.fish
file path=usr/share/fish/completions/canto.fish
@@ -314,6 +324,7 @@
file path=usr/share/fish/completions/cdh.fish
file path=usr/share/fish/completions/cdrecord.fish
file path=usr/share/fish/completions/cf.fish
file path=usr/share/fish/completions/checkinstall.fish
file path=usr/share/fish/completions/chgrp.fish
file path=usr/share/fish/completions/chmod.fish
file path=usr/share/fish/completions/choice.fish
@@ -358,6 +369,7 @@
file path=usr/share/fish/completions/cowthink.fish
file path=usr/share/fish/completions/cp.fish
file path=usr/share/fish/completions/cpupower.fish
file path=usr/share/fish/completions/crc.fish
file path=usr/share/fish/completions/create_ap.fish
file path=usr/share/fish/completions/createdb.fish
file path=usr/share/fish/completions/cryptsetup.fish
@@ -402,6 +414,7 @@
file path=usr/share/fish/completions/dnf.fish
file path=usr/share/fish/completions/doas.fish
file path=usr/share/fish/completions/docker.fish
file path=usr/share/fish/completions/doctl.fish
file path=usr/share/fish/completions/dolphin.fish
file path=usr/share/fish/completions/dotnet.fish
file path=usr/share/fish/completions/downgrade.fish
@@ -498,6 +511,7 @@
file path=usr/share/fish/completions/gem.fish
file path=usr/share/fish/completions/gendarme.fish
file path=usr/share/fish/completions/gh.fish
file path=usr/share/fish/completions/gimp.fish
file path=usr/share/fish/completions/gio.fish
file path=usr/share/fish/completions/git-sizer.fish
file path=usr/share/fish/completions/git.fish
@@ -507,6 +521,7 @@
file path=usr/share/fish/completions/godoc.fish
file path=usr/share/fish/completions/gofmt.fish
file path=usr/share/fish/completions/goimports.fish
file path=usr/share/fish/completions/gojq.fish
file path=usr/share/fish/completions/golint.fish
file path=usr/share/fish/completions/gorename.fish
file path=usr/share/fish/completions/gpasswd.fish
@@ -517,6 +532,7 @@
file path=usr/share/fish/completions/gping.fish
file path=usr/share/fish/completions/gprof.fish
file path=usr/share/fish/completions/gradle.fish
file path=usr/share/fish/completions/gradlew.fish
file path=usr/share/fish/completions/grep.fish
file path=usr/share/fish/completions/gresource.fish
file path=usr/share/fish/completions/groupadd.fish
@@ -530,6 +546,7 @@
file path=usr/share/fish/completions/gv.fish
file path=usr/share/fish/completions/gvim.fish
file path=usr/share/fish/completions/gvimdiff.fish
file path=usr/share/fish/completions/gw.fish
file path=usr/share/fish/completions/gzip.fish
file path=usr/share/fish/completions/hashcat.fish
file path=usr/share/fish/completions/head.fish
@@ -543,11 +560,13 @@
file path=usr/share/fish/completions/hjson.fish
file path=usr/share/fish/completions/hledger.fish
file path=usr/share/fish/completions/homectl.fish
file path=usr/share/fish/completions/horcrux.fish
file path=usr/share/fish/completions/hostnamectl.fish
file path=usr/share/fish/completions/htop.fish
file path=usr/share/fish/completions/hugo.fish
file path=usr/share/fish/completions/hwinfo.fish
file path=usr/share/fish/completions/i3-msg.fish
file path=usr/share/fish/completions/ibmcloud.fish
file path=usr/share/fish/completions/icdiff.fish
file path=usr/share/fish/completions/iconv.fish
file path=usr/share/fish/completions/id.fish
@@ -570,7 +589,9 @@
file path=usr/share/fish/completions/isatty.fish
file path=usr/share/fish/completions/istioctl.fish
file path=usr/share/fish/completions/iw.fish
file path=usr/share/fish/completions/iwctl.fish
file path=usr/share/fish/completions/j.fish
file path=usr/share/fish/completions/java_home.fish
file path=usr/share/fish/completions/jbake.fish
file path=usr/share/fish/completions/jest.fish
file path=usr/share/fish/completions/jhipster.fish
@@ -590,11 +611,11 @@
file path=usr/share/fish/completions/killall.fish
file path=usr/share/fish/completions/kind.fish
file path=usr/share/fish/completions/kitchen.fish
file path=usr/share/fish/completions/kitty.fish
file path=usr/share/fish/completions/kldload.fish
file path=usr/share/fish/completions/kldunload.fish
file path=usr/share/fish/completions/kmutil.fish
file path=usr/share/fish/completions/konsole.fish
file path=usr/share/fish/completions/krita.fish
file path=usr/share/fish/completions/ksh.fish
file path=usr/share/fish/completions/kubectl.fish
file path=usr/share/fish/completions/latex.fish
@@ -647,6 +668,7 @@
file path=usr/share/fish/completions/math.fish
file path=usr/share/fish/completions/matlab.fish
file path=usr/share/fish/completions/mc.fish
file path=usr/share/fish/completions/md-to-clip.fish
file path=usr/share/fish/completions/md5sum.fish
file path=usr/share/fish/completions/mdadm.fish
file path=usr/share/fish/completions/mdbook.fish
@@ -726,6 +748,7 @@
file path=usr/share/fish/completions/nvram.fish
file path=usr/share/fish/completions/objdump.fish
file path=usr/share/fish/completions/obnam.fish
file path=usr/share/fish/completions/oc.fish
file path=usr/share/fish/completions/octave.fish
file path=usr/share/fish/completions/oggenc.fish
file path=usr/share/fish/completions/oksh.fish
@@ -825,6 +848,8 @@
file path=usr/share/fish/completions/python3.fish
file path=usr/share/fish/completions/pzstd.fish
file path=usr/share/fish/completions/qdbus.fish
file path=usr/share/fish/completions/qjs.fish
file path=usr/share/fish/completions/qjsc.fish
file path=usr/share/fish/completions/qmk.fish
file path=usr/share/fish/completions/qshell.fish
file path=usr/share/fish/completions/qubes-gpg-client.fish
@@ -847,6 +872,7 @@
file path=usr/share/fish/completions/reg.fish
file path=usr/share/fish/completions/reject.fish
file path=usr/share/fish/completions/rejmerge.fish
file path=usr/share/fish/completions/rename.fish
file path=usr/share/fish/completions/renice.fish
file path=usr/share/fish/completions/resolvectl.fish
file path=usr/share/fish/completions/return.fish
@@ -857,6 +883,7 @@
file path=usr/share/fish/completions/rmmod.fish
file path=usr/share/fish/completions/root.fish
file path=usr/share/fish/completions/roswell.fish
file path=usr/share/fish/completions/rpm-ostree.fish
file path=usr/share/fish/completions/rpm.fish
file path=usr/share/fish/completions/rst2html.fish
file path=usr/share/fish/completions/rst2html4.fish
@@ -907,6 +934,7 @@
file path=usr/share/fish/completions/sha512sum.fish
file path=usr/share/fish/completions/shortcuts.fish
file path=usr/share/fish/completions/signify.fish
file path=usr/share/fish/completions/smerge.fish
file path=usr/share/fish/completions/snap.fish
file path=usr/share/fish/completions/sops.fish
file path=usr/share/fish/completions/sort.fish
@@ -1002,6 +1030,7 @@
file path=usr/share/fish/completions/usbip.fish
file path=usr/share/fish/completions/useradd.fish
file path=usr/share/fish/completions/userdbctl.fish
file path=usr/share/fish/completions/userdel.fish
file path=usr/share/fish/completions/usermod.fish
file path=usr/share/fish/completions/vagrant.fish
file path=usr/share/fish/completions/valgrind.fish
@@ -1018,6 +1047,7 @@
file path=usr/share/fish/completions/wait.fish
file path=usr/share/fish/completions/wajig.fish
file path=usr/share/fish/completions/watch.fish
file path=usr/share/fish/completions/watchexec.fish
file path=usr/share/fish/completions/wc.fish
file path=usr/share/fish/completions/wesnoth.fish
file path=usr/share/fish/completions/wg-quick.fish
@@ -1036,6 +1066,7 @@
file path=usr/share/fish/completions/wireshark.fish
file path=usr/share/fish/completions/wish.fish
file path=usr/share/fish/completions/wpa_cli.fish
file path=usr/share/fish/completions/wpctl.fish
file path=usr/share/fish/completions/wslpath.fish
file path=usr/share/fish/completions/wvdial.fish
file path=usr/share/fish/completions/xargs.fish
@@ -1074,6 +1105,7 @@
file path=usr/share/fish/completions/xsv.fish
file path=usr/share/fish/completions/xterm.fish
file path=usr/share/fish/completions/xviewer.fish
file path=usr/share/fish/completions/xxd.fish
file path=usr/share/fish/completions/xxh128sum.fish
file path=usr/share/fish/completions/xxh32sum.fish
file path=usr/share/fish/completions/xxh64sum.fish
@@ -1086,6 +1118,14 @@
file path=usr/share/fish/completions/yast2.fish
file path=usr/share/fish/completions/ykman.fish
file path=usr/share/fish/completions/yum.fish
file path=usr/share/fish/completions/zabbix_agent2.fish
file path=usr/share/fish/completions/zabbix_agentd.fish
file path=usr/share/fish/completions/zabbix_get.fish
file path=usr/share/fish/completions/zabbix_js.fish
file path=usr/share/fish/completions/zabbix_proxy.fish
file path=usr/share/fish/completions/zabbix_sender.fish
file path=usr/share/fish/completions/zabbix_server.fish
file path=usr/share/fish/completions/zabbix_web_service.fish
file path=usr/share/fish/completions/zcat.fish
file path=usr/share/fish/completions/zef.fish
file path=usr/share/fish/completions/zfs.fish
@@ -1104,6 +1144,7 @@
file path=usr/share/fish/config.fish
file path=usr/share/fish/functions/N_.fish
file path=usr/share/fish/functions/__fish_any_arg_in.fish
file path=usr/share/fish/functions/__fish_anypager.fish
file path=usr/share/fish/functions/__fish_anypython.fish
file path=usr/share/fish/functions/__fish_append.fish
file path=usr/share/fish/functions/__fish_apropos.fish
@@ -1272,6 +1313,7 @@
file path=usr/share/fish/functions/fish_default_key_bindings.fish
file path=usr/share/fish/functions/fish_default_mode_prompt.fish
file path=usr/share/fish/functions/fish_delta.fish
file path=usr/share/fish/functions/fish_fossil_prompt.fish
file path=usr/share/fish/functions/fish_git_prompt.fish
file path=usr/share/fish/functions/fish_greeting.fish
file path=usr/share/fish/functions/fish_hg_prompt.fish
@@ -1357,6 +1399,7 @@
file path=usr/share/fish/man/man1/fish-for-bash-users.1
file path=usr/share/fish/man/man1/fish-interactive.1
file path=usr/share/fish/man/man1/fish-language.1
file path=usr/share/fish/man/man1/fish-prompt-tutorial.1
file path=usr/share/fish/man/man1/fish-releasenotes.1
file path=usr/share/fish/man/man1/fish-tutorial.1
file path=usr/share/fish/man/man1/fish.1
@@ -1366,6 +1409,7 @@
file path=usr/share/fish/man/man1/fish_clipboard_paste.1
file path=usr/share/fish/man/man1/fish_command_not_found.1
file path=usr/share/fish/man/man1/fish_config.1
file path=usr/share/fish/man/man1/fish_default_key_bindings.1
file path=usr/share/fish/man/man1/fish_delta.1
file path=usr/share/fish/man/man1/fish_git_prompt.1
file path=usr/share/fish/man/man1/fish_greeting.1
@@ -1382,6 +1426,7 @@
file path=usr/share/fish/man/man1/fish_title.1
file path=usr/share/fish/man/man1/fish_update_completions.1
file path=usr/share/fish/man/man1/fish_vcs_prompt.1
file path=usr/share/fish/man/man1/fish_vi_key_bindings.1
file path=usr/share/fish/man/man1/for.1
file path=usr/share/fish/man/man1/funced.1
file path=usr/share/fish/man/man1/funcsave.1
@@ -1449,6 +1494,7 @@
file path=usr/share/fish/tools/web_config/delete.png
file path=usr/share/fish/tools/web_config/favicon.png
file path=usr/share/fish/tools/web_config/fishconfig.css
file path=usr/share/fish/tools/web_config/fishconfig_print.css
file path=usr/share/fish/tools/web_config/index.html
file path=usr/share/fish/tools/web_config/js/angular-route.js
file path=usr/share/fish/tools/web_config/js/angular-sanitize.js

 components/shell/fish/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2023 <contributor>
# Copyright 2024 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -85,6 +85,7 @@
file path=usr/share/doc/fish/cmds/fish_clipboard_paste.html
file path=usr/share/doc/fish/cmds/fish_command_not_found.html
file path=usr/share/doc/fish/cmds/fish_config.html
file path=usr/share/doc/fish/cmds/fish_default_key_bindings.html
file path=usr/share/doc/fish/cmds/fish_delta.html
file path=usr/share/doc/fish/cmds/fish_git_prompt.html
file path=usr/share/doc/fish/cmds/fish_greeting.html
@@ -101,6 +102,7 @@
file path=usr/share/doc/fish/cmds/fish_title.html
file path=usr/share/doc/fish/cmds/fish_update_completions.html
file path=usr/share/doc/fish/cmds/fish_vcs_prompt.html
file path=usr/share/doc/fish/cmds/fish_vi_key_bindings.html
file path=usr/share/doc/fish/cmds/for.html
file path=usr/share/doc/fish/cmds/funced.html
file path=usr/share/doc/fish/cmds/funcsave.html
@@ -175,6 +177,7 @@
file path=usr/share/doc/fish/language.html
file path=usr/share/doc/fish/license.html
file path=usr/share/doc/fish/objects.inv
file path=usr/share/doc/fish/prompt.html
file path=usr/share/doc/fish/relnotes.html
file path=usr/share/doc/fish/search.html
file path=usr/share/doc/fish/searchindex.js
@@ -201,6 +204,9 @@
file path=usr/share/fish/completions/adb.fish
file path=usr/share/fish/completions/adduser.fish
file path=usr/share/fish/completions/adiff.fish
file path=usr/share/fish/completions/age-keygen.fish
file path=usr/share/fish/completions/age.fish
file path=usr/share/fish/completions/airmon-ng.fish
file path=usr/share/fish/completions/alias.fish
file path=usr/share/fish/completions/als.fish
file path=usr/share/fish/completions/alsactl.fish
@@ -244,6 +250,7 @@
file path=usr/share/fish/completions/apt-zip-list.fish
file path=usr/share/fish/completions/apt.fish
file path=usr/share/fish/completions/aptitude.fish
file path=usr/share/fish/completions/ar.fish
file path=usr/share/fish/completions/arc.fish
file path=usr/share/fish/completions/archlinux-java.fish
file path=usr/share/fish/completions/arepack.fish
@@ -281,6 +288,7 @@
file path=usr/share/fish/completions/bind.fish
file path=usr/share/fish/completions/bison.fish
file path=usr/share/fish/completions/black.fish
file path=usr/share/fish/completions/blender.fish
file path=usr/share/fish/completions/block.fish
file path=usr/share/fish/completions/bluetoothctl.fish
file path=usr/share/fish/completions/bootctl.fish
@@ -296,6 +304,7 @@
file path=usr/share/fish/completions/bundle.fish
file path=usr/share/fish/completions/bunzip2.fish
file path=usr/share/fish/completions/busctl.fish
file path=usr/share/fish/completions/bws.fish
file path=usr/share/fish/completions/bzcat.fish
file path=usr/share/fish/completions/bzip2.fish
file path=usr/share/fish/completions/bzip2recover.fish
@@ -304,6 +313,7 @@
file path=usr/share/fish/completions/cabal.fish
file path=usr/share/fish/completions/caddy.fish
file path=usr/share/fish/completions/caffeinate.fish
file path=usr/share/fish/completions/calendar.fish
file path=usr/share/fish/completions/camcontrol.fish
file path=usr/share/fish/completions/cancel.fish
file path=usr/share/fish/completions/canto.fish
@@ -314,6 +324,7 @@
file path=usr/share/fish/completions/cdh.fish
file path=usr/share/fish/completions/cdrecord.fish
file path=usr/share/fish/completions/cf.fish
file path=usr/share/fish/completions/checkinstall.fish
file path=usr/share/fish/completions/chgrp.fish
file path=usr/share/fish/completions/chmod.fish
file path=usr/share/fish/completions/choice.fish
@@ -358,6 +369,7 @@
file path=usr/share/fish/completions/cowthink.fish
file path=usr/share/fish/completions/cp.fish
file path=usr/share/fish/completions/cpupower.fish
file path=usr/share/fish/completions/crc.fish
file path=usr/share/fish/completions/create_ap.fish
file path=usr/share/fish/completions/createdb.fish
file path=usr/share/fish/completions/cryptsetup.fish
@@ -402,6 +414,7 @@
file path=usr/share/fish/completions/dnf.fish
file path=usr/share/fish/completions/doas.fish
file path=usr/share/fish/completions/docker.fish
file path=usr/share/fish/completions/doctl.fish
file path=usr/share/fish/completions/dolphin.fish
file path=usr/share/fish/completions/dotnet.fish
file path=usr/share/fish/completions/downgrade.fish
@@ -498,6 +511,7 @@
file path=usr/share/fish/completions/gem.fish
file path=usr/share/fish/completions/gendarme.fish
file path=usr/share/fish/completions/gh.fish
file path=usr/share/fish/completions/gimp.fish
file path=usr/share/fish/completions/gio.fish
file path=usr/share/fish/completions/git-sizer.fish
file path=usr/share/fish/completions/git.fish
@@ -507,6 +521,7 @@
file path=usr/share/fish/completions/godoc.fish
file path=usr/share/fish/completions/gofmt.fish
file path=usr/share/fish/completions/goimports.fish
file path=usr/share/fish/completions/gojq.fish
file path=usr/share/fish/completions/golint.fish
file path=usr/share/fish/completions/gorename.fish
file path=usr/share/fish/completions/gpasswd.fish
@@ -517,6 +532,7 @@
file path=usr/share/fish/completions/gping.fish
file path=usr/share/fish/completions/gprof.fish
file path=usr/share/fish/completions/gradle.fish
file path=usr/share/fish/completions/gradlew.fish
file path=usr/share/fish/completions/grep.fish
file path=usr/share/fish/completions/gresource.fish
file path=usr/share/fish/completions/groupadd.fish
@@ -530,6 +546,7 @@
file path=usr/share/fish/completions/gv.fish
file path=usr/share/fish/completions/gvim.fish
file path=usr/share/fish/completions/gvimdiff.fish
file path=usr/share/fish/completions/gw.fish
file path=usr/share/fish/completions/gzip.fish
file path=usr/share/fish/completions/hashcat.fish
file path=usr/share/fish/completions/head.fish
@@ -543,11 +560,13 @@
file path=usr/share/fish/completions/hjson.fish
file path=usr/share/fish/completions/hledger.fish
file path=usr/share/fish/completions/homectl.fish
file path=usr/share/fish/completions/horcrux.fish
file path=usr/share/fish/completions/hostnamectl.fish
file path=usr/share/fish/completions/htop.fish
file path=usr/share/fish/completions/hugo.fish
file path=usr/share/fish/completions/hwinfo.fish
file path=usr/share/fish/completions/i3-msg.fish
file path=usr/share/fish/completions/ibmcloud.fish
file path=usr/share/fish/completions/icdiff.fish
file path=usr/share/fish/completions/iconv.fish
file path=usr/share/fish/completions/id.fish
@@ -570,7 +589,9 @@
file path=usr/share/fish/completions/isatty.fish
file path=usr/share/fish/completions/istioctl.fish
file path=usr/share/fish/completions/iw.fish
file path=usr/share/fish/completions/iwctl.fish
file path=usr/share/fish/completions/j.fish
file path=usr/share/fish/completions/java_home.fish
file path=usr/share/fish/completions/jbake.fish
file path=usr/share/fish/completions/jest.fish
file path=usr/share/fish/completions/jhipster.fish
@@ -590,11 +611,11 @@
file path=usr/share/fish/completions/killall.fish
file path=usr/share/fish/completions/kind.fish
file path=usr/share/fish/completions/kitchen.fish
file path=usr/share/fish/completions/kitty.fish
file path=usr/share/fish/completions/kldload.fish
file path=usr/share/fish/completions/kldunload.fish
file path=usr/share/fish/completions/kmutil.fish
file path=usr/share/fish/completions/konsole.fish
file path=usr/share/fish/completions/krita.fish
file path=usr/share/fish/completions/ksh.fish
file path=usr/share/fish/completions/kubectl.fish
file path=usr/share/fish/completions/latex.fish
@@ -647,6 +668,7 @@
file path=usr/share/fish/completions/math.fish
file path=usr/share/fish/completions/matlab.fish
file path=usr/share/fish/completions/mc.fish
file path=usr/share/fish/completions/md-to-clip.fish
file path=usr/share/fish/completions/md5sum.fish
file path=usr/share/fish/completions/mdadm.fish
file path=usr/share/fish/completions/mdbook.fish
@@ -726,6 +748,7 @@
file path=usr/share/fish/completions/nvram.fish
file path=usr/share/fish/completions/objdump.fish
file path=usr/share/fish/completions/obnam.fish
file path=usr/share/fish/completions/oc.fish
file path=usr/share/fish/completions/octave.fish
file path=usr/share/fish/completions/oggenc.fish
file path=usr/share/fish/completions/oksh.fish
@@ -825,6 +848,8 @@
file path=usr/share/fish/completions/python3.fish
file path=usr/share/fish/completions/pzstd.fish
file path=usr/share/fish/completions/qdbus.fish
file path=usr/share/fish/completions/qjs.fish
file path=usr/share/fish/completions/qjsc.fish
file path=usr/share/fish/completions/qmk.fish
file path=usr/share/fish/completions/qshell.fish
file path=usr/share/fish/completions/qubes-gpg-client.fish
@@ -847,6 +872,7 @@
file path=usr/share/fish/completions/reg.fish
file path=usr/share/fish/completions/reject.fish
file path=usr/share/fish/completions/rejmerge.fish
file path=usr/share/fish/completions/rename.fish
file path=usr/share/fish/completions/renice.fish
file path=usr/share/fish/completions/resolvectl.fish
file path=usr/share/fish/completions/return.fish
@@ -857,6 +883,7 @@
file path=usr/share/fish/completions/rmmod.fish
file path=usr/share/fish/completions/root.fish
file path=usr/share/fish/completions/roswell.fish
file path=usr/share/fish/completions/rpm-ostree.fish
file path=usr/share/fish/completions/rpm.fish
file path=usr/share/fish/completions/rst2html.fish
file path=usr/share/fish/completions/rst2html4.fish
@@ -907,6 +934,7 @@
file path=usr/share/fish/completions/sha512sum.fish
file path=usr/share/fish/completions/shortcuts.fish
file path=usr/share/fish/completions/signify.fish
file path=usr/share/fish/completions/smerge.fish
file path=usr/share/fish/completions/snap.fish
file path=usr/share/fish/completions/sops.fish
file path=usr/share/fish/completions/sort.fish
@@ -1002,6 +1030,7 @@
file path=usr/share/fish/completions/usbip.fish
file path=usr/share/fish/completions/useradd.fish
file path=usr/share/fish/completions/userdbctl.fish
file path=usr/share/fish/completions/userdel.fish
file path=usr/share/fish/completions/usermod.fish
file path=usr/share/fish/completions/vagrant.fish
file path=usr/share/fish/completions/valgrind.fish
@@ -1018,6 +1047,7 @@
file path=usr/share/fish/completions/wait.fish
file path=usr/share/fish/completions/wajig.fish
file path=usr/share/fish/completions/watch.fish
file path=usr/share/fish/completions/watchexec.fish
file path=usr/share/fish/completions/wc.fish
file path=usr/share/fish/completions/wesnoth.fish
file path=usr/share/fish/completions/wg-quick.fish
@@ -1036,6 +1066,7 @@
file path=usr/share/fish/completions/wireshark.fish
file path=usr/share/fish/completions/wish.fish
file path=usr/share/fish/completions/wpa_cli.fish
file path=usr/share/fish/completions/wpctl.fish
file path=usr/share/fish/completions/wslpath.fish
file path=usr/share/fish/completions/wvdial.fish
file path=usr/share/fish/completions/xargs.fish
@@ -1074,6 +1105,7 @@
file path=usr/share/fish/completions/xsv.fish
file path=usr/share/fish/completions/xterm.fish
file path=usr/share/fish/completions/xviewer.fish
file path=usr/share/fish/completions/xxd.fish
file path=usr/share/fish/completions/xxh128sum.fish
file path=usr/share/fish/completions/xxh32sum.fish
file path=usr/share/fish/completions/xxh64sum.fish
@@ -1086,6 +1118,14 @@
file path=usr/share/fish/completions/yast2.fish
file path=usr/share/fish/completions/ykman.fish
file path=usr/share/fish/completions/yum.fish
file path=usr/share/fish/completions/zabbix_agent2.fish
file path=usr/share/fish/completions/zabbix_agentd.fish
file path=usr/share/fish/completions/zabbix_get.fish
file path=usr/share/fish/completions/zabbix_js.fish
file path=usr/share/fish/completions/zabbix_proxy.fish
file path=usr/share/fish/completions/zabbix_sender.fish
file path=usr/share/fish/completions/zabbix_server.fish
file path=usr/share/fish/completions/zabbix_web_service.fish
file path=usr/share/fish/completions/zcat.fish
file path=usr/share/fish/completions/zef.fish
file path=usr/share/fish/completions/zfs.fish
@@ -1104,6 +1144,7 @@
file path=usr/share/fish/config.fish
file path=usr/share/fish/functions/N_.fish
file path=usr/share/fish/functions/__fish_any_arg_in.fish
file path=usr/share/fish/functions/__fish_anypager.fish
file path=usr/share/fish/functions/__fish_anypython.fish
file path=usr/share/fish/functions/__fish_append.fish
file path=usr/share/fish/functions/__fish_apropos.fish
@@ -1272,6 +1313,7 @@
file path=usr/share/fish/functions/fish_default_key_bindings.fish
file path=usr/share/fish/functions/fish_default_mode_prompt.fish
file path=usr/share/fish/functions/fish_delta.fish
file path=usr/share/fish/functions/fish_fossil_prompt.fish
file path=usr/share/fish/functions/fish_git_prompt.fish
file path=usr/share/fish/functions/fish_greeting.fish
file path=usr/share/fish/functions/fish_hg_prompt.fish
@@ -1357,6 +1399,7 @@
file path=usr/share/fish/man/man1/fish-for-bash-users.1
file path=usr/share/fish/man/man1/fish-interactive.1
file path=usr/share/fish/man/man1/fish-language.1
file path=usr/share/fish/man/man1/fish-prompt-tutorial.1
file path=usr/share/fish/man/man1/fish-releasenotes.1
file path=usr/share/fish/man/man1/fish-tutorial.1
file path=usr/share/fish/man/man1/fish.1
@@ -1366,6 +1409,7 @@
file path=usr/share/fish/man/man1/fish_clipboard_paste.1
file path=usr/share/fish/man/man1/fish_command_not_found.1
file path=usr/share/fish/man/man1/fish_config.1
file path=usr/share/fish/man/man1/fish_default_key_bindings.1
file path=usr/share/fish/man/man1/fish_delta.1
file path=usr/share/fish/man/man1/fish_git_prompt.1
file path=usr/share/fish/man/man1/fish_greeting.1
@@ -1382,6 +1426,7 @@
file path=usr/share/fish/man/man1/fish_title.1
file path=usr/share/fish/man/man1/fish_update_completions.1
file path=usr/share/fish/man/man1/fish_vcs_prompt.1
file path=usr/share/fish/man/man1/fish_vi_key_bindings.1
file path=usr/share/fish/man/man1/for.1
file path=usr/share/fish/man/man1/funced.1
file path=usr/share/fish/man/man1/funcsave.1
@@ -1449,6 +1494,7 @@
file path=usr/share/fish/tools/web_config/delete.png
file path=usr/share/fish/tools/web_config/favicon.png
file path=usr/share/fish/tools/web_config/fishconfig.css
file path=usr/share/fish/tools/web_config/fishconfig_print.css
file path=usr/share/fish/tools/web_config/index.html
file path=usr/share/fish/tools/web_config/js/angular-route.js
file path=usr/share/fish/tools/web_config/js/angular-sanitize.js

 components/shell/fish/patches/02-fix-reg.patch

@@ -50,3 +50,14 @@
         } else if (entry->name == dirlinkname) {
             expected = dir_entry_type_t::dir;
         } else if (entry->name == badlinkname) {
--- fish-3.7.0/src/wildcard.cpp.orig    2024-01-01 16:15:17.000000000 +0100
+++ fish-3.7.0/src/wildcard.cpp    2024-01-01 20:23:37.471572632 +0100
@@ -386,7 +386,7 @@
     }
 
     // regular file *excludes* broken links - we have no use for them as commands.
-    const bool is_regular_file = entry.check_type() == dir_entry_type_t::reg;
+    const bool is_regular_file = entry.check_type() == dir_entry_type_t::regr;
     if (executables_only && (!is_regular_file || waccess(filepath, X_OK) != 0)) {
         return false;
     }

 components/shell/fish/test/results-all.master

@@ -1,518 +1,520 @@
        Start  96: check-completions.fish
        Start 107: complete.fish
        Start 160: path.fish
        Start 193: tmux-abbr.fish
        Start 194: tmux-bind.fish
        Start 195: tmux-complete.fish
        Start 196: tmux-history-search.fish
        Start 197: tmux-prompt.fish
  1/246 Test #107: complete.fish ............................***Failed    
        Start 223: exit_nohang.py
  2/246 Test #197: tmux-prompt.fish .........................***Failed    
  which failed to match line stdout:1:
        Start 224: fg.py
  3/246 Test #194: tmux-bind.fish ...........................***Failed    
  which failed to match line stdout:1:
        Start 225: fkr.py
  4/246 Test #223: exit_nohang.py ...........................***Failed    
1 test failed
        Start 241: terminal.py
  5/246 Test #193: tmux-abbr.fish ...........................***Failed    
  which failed to match line stdout:1:
        Start  63: history_merge
  6/246 Test #196: tmux-history-search.fish .................***Failed    
  which failed to match line stdout:1:
        Start 149: jobs.fish
  7/246 Test #160: path.fish ................................***Failed    
  which failed to match line stdout:42:
        Start   1: utility_functions
        Start   2: dir_iter
        Start   3: string_split
        Start   4: wwrite_to_fd
        Start   5: env_vars
        Start   6: env
        Start   7: str_to_num
        Start   8: enum
  1/247 Test   #1: utility_functions ........................   Passed    
        Start   9: highlighting
  2/247 Test   #2: dir_iter .................................   Passed    
        Start  10: new_parser_ll2
  3/247 Test   #5: env_vars .................................   Passed    
        Start  11: new_parser_fuzzing
  4/247 Test   #3: string_split .............................   Passed    
        Start  12: new_parser_correctness
  5/247 Test   #4: wwrite_to_fd .............................   Passed    
        Start  13: new_parser_ad_hoc
  6/247 Test   #7: str_to_num ...............................   Passed    
        Start  14: new_parser_errors
  7/247 Test   #8: enum .....................................   Passed    
        Start  15: error_messages
  8/247 Test   #6: env ......................................   Passed    
        Start  16: escape
  9/247 Test  #10: new_parser_ll2 ...........................   Passed    
        Start  17: format
 10/247 Test  #12: new_parser_correctness ...................   Passed    
        Start  18: convert
 11/247 Test  #13: new_parser_ad_hoc ........................   Passed    
        Start  19: convert_ascii
 12/247 Test  #14: new_parser_errors ........................   Passed    
        Start  20: perf_convert_ascii
 13/247 Test  #15: error_messages ...........................   Passed    
        Start  21: convert_nulls
 14/247 Test  #17: format ...................................   Passed    
        Start  22: tokenizer
 15/247 Test  #21: convert_nulls ............................   Passed    
        Start  23: fd_monitor
 16/247 Test  #22: tokenizer ................................   Passed    
        Start  24: iothread
 17/247 Test  #24: iothread .................................   Passed    
        Start  25: pthread
 18/247 Test  #25: pthread ..................................   Passed    
        Start  26: debounce
 19/247 Test  #20: perf_convert_ascii .......................   Passed    
        Start  27: parser
 20/247 Test  #23: fd_monitor ...............................   Passed    
        Start  28: cancellation
  8/246 Test  #96: check-completions.fish ...................***Failed    
        Start 212: bind.py
  9/246 Test #195: tmux-complete.fish .......................***Failed    
  which failed to match line stdout:1:
        Start 245: wait.py
 10/246 Test #241: terminal.py ..............................***Failed    
Testing file pexpects/terminal.py:[31mFailed to match pattern:[39m [1mterm\-support:\ Terminal\ has\ 0\ columns,\ falling\ back\ to\ default\ width[0m
1 test failed
 21/247 Test  #27: parser ...................................   Passed    
        Start  29: indents
 22/247 Test  #29: indents ..................................   Passed    
        Start  30: utf8
 23/247 Test  #30: utf8 .....................................   Passed    
        Start  31: feature_flags
 24/247 Test  #31: feature_flags ............................   Passed    
        Start  32: escape_sequences
 25/247 Test  #16: escape ...................................   Passed    
        Start  33: pcre2_escape
 26/247 Test  #32: escape_sequences .........................   Passed    
        Start  34: lru
 27/247 Test  #33: pcre2_escape .............................   Passed    
        Start  35: expand
 28/247 Test  #34: lru ......................................   Passed    
        Start  36: fuzzy_match
 29/247 Test  #36: fuzzy_match ..............................   Passed    
        Start  37: ifind
 30/247 Test  #37: ifind ....................................   Passed    
        Start  38: ifind_fuzzy
 31/247 Test  #11: new_parser_fuzzing .......................   Passed    
        Start  39: abbreviations
 32/247 Test  #35: expand ...................................   Passed    
        Start  40: builtins/test
 33/247 Test  #38: ifind_fuzzy ..............................   Passed    
        Start  41: wcstod
 34/247 Test  #39: abbreviations ............................   Passed    
        Start  42: fish_wcstod_underscores
 35/247 Test  #40: builtins/test ............................   Passed    
        Start  43: dup2s
 36/247 Test  #41: wcstod ...................................   Passed    
        Start  44: path
 37/247 Test  #42: fish_wcstod_underscores ..................   Passed    
        Start  45: pager_navigation
 38/247 Test  #43: dup2s ....................................   Passed    
        Start  46: pager_layout
 39/247 Test  #44: path .....................................   Passed    
        Start  47: word_motion
 40/247 Test  #45: pager_navigation .........................   Passed    
        Start  48: is_potential_path
 41/247 Test  #46: pager_layout .............................   Passed    
        Start  49: colors
 42/247 Test  #47: word_motion ..............................   Passed    
        Start  50: wildcard
 43/247 Test  #49: colors ...................................   Passed    
        Start  51: complete
 44/247 Test  #50: wildcard .................................   Passed    
        Start  52: autoload
 45/247 Test  #48: is_potential_path ........................   Passed    
        Start  53: input
 46/247 Test  #53: input ....................................   Passed    
        Start  54: line_iterator
 47/247 Test  #52: autoload .................................   Passed    
        Start  55: undo
 48/247 Test  #54: line_iterator ............................   Passed    
        Start  56: universal
 49/247 Test  #55: undo .....................................   Passed    
        Start  57: wait_handles
 50/247 Test  #57: wait_handles .............................   Passed    
        Start  58: completion_insertions
 51/247 Test  #58: completion_insertions ....................   Passed    
        Start  59: autosuggestion_ignores
 52/247 Test  #59: autosuggestion_ignores ...................   Passed    
        Start  60: autosuggestion_combining
 53/247 Test  #60: autosuggestion_combining .................   Passed    
        Start  61: autosuggest_suggest_special
 54/247 Test  #51: complete .................................   Passed    
        Start  62: history
 55/247 Test  #62: history ..................................   Passed    
        Start  63: history_merge
 56/247 Test  #61: autosuggest_suggest_special ..............   Passed    
        Start  64: history_paths
 57/247 Test  #64: history_paths ............................   Passed    
        Start  65: history_races
 58/247 Test  #18: convert ..................................   Passed    
        Start  66: history_formats
 59/247 Test  #66: history_formats ..........................   Passed    
        Start  67: string
 60/247 Test  #67: string ...................................   Passed    
        Start  68: illegal_command_exit_code
 61/247 Test  #19: convert_ascii ............................   Passed    
        Start  69: maybe
 62/247 Test  #68: illegal_command_exit_code ................   Passed    
        Start  70: layout_cache
 63/247 Test  #69: maybe ....................................   Passed    
        Start  71: prompt
 64/247 Test  #71: prompt ...................................   Passed    
        Start  72: normalize
 65/247 Test  #70: layout_cache .............................   Passed    
        Start  73: dirname
 66/247 Test  #72: normalize ................................   Passed    
        Start  74: topics
 67/247 Test  #73: dirname ..................................   Passed    
        Start  75: pipes
 68/247 Test  #75: pipes ....................................   Passed    
        Start  76: fd_event
 69/247 Test  #76: fd_event .................................   Passed    
        Start  77: timer_format
 70/247 Test  #77: timer_format .............................   Passed    
        Start  78: termsize
 71/247 Test  #26: debounce .................................   Passed    
        Start  79: killring
 72/247 Test  #79: killring .................................   Passed    
        Start  80: re
 73/247 Test  #78: termsize .................................   Passed    
        Start  81: wgetopt
 74/247 Test  #74: topics ...................................   Passed    
        Start  82: abbr.fish
 75/247 Test  #81: wgetopt ..................................   Passed    
        Start  83: alias.fish
 76/247 Test  #82: abbr.fish ................................   Passed    
        Start  84: andandoror.fish
 77/247 Test  #83: alias.fish ...............................   Passed    
        Start  85: andor.fish
 78/247 Test  #84: andandoror.fish ..........................   Passed    
        Start  86: argparse.fish
 79/247 Test  #85: andor.fish ...............................   Passed    
        Start  87: bad-option.fish
 80/247 Test  #87: bad-option.fish ..........................   Passed    
        Start  88: basic.fish
 81/247 Test  #86: argparse.fish ............................   Passed    
        Start  89: bind.fish
 82/247 Test  #80: re .......................................   Passed    
        Start  90: braces.fish
 83/247 Test   #9: highlighting .............................   Passed    
        Start  91: broken-config.fish
 84/247 Test  #65: history_races ............................   Passed    
        Start  92: builtinbuiltin.fish
 85/247 Test  #89: bind.fish ................................   Passed    
        Start  93: caller-observer.fish
 86/247 Test  #90: braces.fish ..............................   Passed    
        Start  94: cd.fish
 87/247 Test  #91: broken-config.fish .......................   Passed    
        Start  95: check-all-fish-files.fish
 11/246 Test  #95: check-all-fish-files.fish ................   Passed    
        Start 232: pipeline.py
 12/246 Test #212: bind.py ..................................   Passed    
        Start 207: wait.fish
 13/246 Test #225: fkr.py ...................................***Failed    
 88/247 Test  #92: builtinbuiltin.fish ......................   Passed    
        Start  96: check-completions.fish
 89/247 Test  #93: caller-observer.fish .....................   Passed    
        Start  97: check-translations.fish
 90/247 Test  #88: basic.fish ...............................   Passed    
        Start  98: cmdsub-limit.fish
 91/247 Test  #98: cmdsub-limit.fish ........................   Passed    
        Start  99: cmdsub.fish
 92/247 Test  #99: cmdsub.fish ..............................   Passed    
        Start 100: colon-delimited-var.fish
 93/247 Test #100: colon-delimited-var.fish .................   Passed    
        Start 101: command-1.fish
 94/247 Test #101: command-1.fish ...........................   Passed    
        Start 102: command-2.fish
 95/247 Test  #56: universal ................................   Passed    
        Start 103: command-not-found.fish
 96/247 Test #102: command-2.fish ...........................   Passed    
        Start 104: command-vars-persist.fish
 97/247 Test #103: command-not-found.fish ...................   Passed    
        Start 105: commandline.fish
 98/247 Test #104: command-vars-persist.fish ................   Passed    
        Start 106: complete-group-order.fish
 99/247 Test #105: commandline.fish .........................   Passed    
        Start 107: complete.fish
100/247 Test #106: complete-group-order.fish ................   Passed    
        Start 108: complete_directories.fish
101/247 Test #108: complete_directories.fish ................   Passed    
        Start 109: contains_opt.fish
102/247 Test  #94: cd.fish ..................................   Passed    
        Start 110: count.fish
103/247 Test #109: contains_opt.fish ........................   Passed    
        Start 111: deep-cmdsub.fish
104/247 Test #110: count.fish ...............................   Passed    
        Start 112: directory-redirect.fish
105/247 Test #111: deep-cmdsub.fish .........................   Passed    
        Start 113: disown-parent.fish
106/247 Test #112: directory-redirect.fish ..................   Passed    
        Start 114: empty.fish
107/247 Test #114: empty.fish ...............................   Passed    
        Start 115: env.fish
108/247 Test  #97: check-translations.fish ..................   Passed    
        Start 116: eval.fish
109/247 Test #115: env.fish .................................   Passed    
        Start 117: exec.fish
110/247 Test #116: eval.fish ................................   Passed    
        Start 118: exit-status-with-closing-stderr.fish
111/247 Test #107: complete.fish ............................***Failed    
        Start 119: expansion.fish
112/247 Test #117: exec.fish ................................   Passed    
        Start 120: fds.fish
113/247 Test #118: exit-status-with-closing-stderr.fish .....   Passed    
        Start 121: features-ampersand-nobg-in-token1.fish
114/247 Test #113: disown-parent.fish .......................   Passed    
        Start 122: features-nocaret1.fish
115/247 Test #120: fds.fish .................................   Passed    
        Start 123: features-nocaret2.fish
116/247 Test #119: expansion.fish ...........................   Passed    
        Start 124: features-nocaret3.fish
117/247 Test #121: features-ampersand-nobg-in-token1.fish ...   Passed    
        Start 125: features-nocaret4.fish
118/247 Test #122: features-nocaret1.fish ...................   Passed    
        Start 126: features-qmark1.fish
119/247 Test #123: features-nocaret2.fish ...................   Passed    
        Start 127: features-qmark2.fish
120/247 Test #124: features-nocaret3.fish ...................   Passed    
        Start 128: features-string-backslashes-off.fish
121/247 Test #125: features-nocaret4.fish ...................   Passed    
        Start 129: features-string-backslashes.fish
122/247 Test #126: features-qmark1.fish .....................   Passed    
        Start 130: fish_add_path.fish
123/247 Test #127: features-qmark2.fish .....................   Passed    
        Start 131: fish_user_paths.fish
124/247 Test #128: features-string-backslashes-off.fish .....   Passed    
        Start 132: for.fish
125/247 Test #129: features-string-backslashes.fish .........   Passed    
        Start 133: function-definition.fish
126/247 Test #130: fish_add_path.fish .......................   Passed    
        Start 134: function.fish
127/247 Test #132: for.fish .................................   Passed    
        Start 135: functions.fish
128/247 Test #131: fish_user_paths.fish .....................   Passed    
        Start 136: git.fish
129/247 Test #133: function-definition.fish .................   Passed    
        Start 137: glob.fish
130/247 Test #134: function.fish ............................   Passed    
        Start 138: history.fish
131/247 Test #135: functions.fish ...........................   Passed    
        Start 139: indent.fish
132/247 Test  #28: cancellation .............................   Passed    
        Start 140: init-command-2.fish
133/247 Test #137: glob.fish ................................   Passed    
        Start 141: init-command-mix-ordering.fish
134/247 Test #138: history.fish .............................   Passed    
        Start 142: init-command-mix.fish
135/247 Test #140: init-command-2.fish ......................   Passed    
        Start 143: init-command.fish
136/247 Test #141: init-command-mix-ordering.fish ...........   Passed    
        Start 144: init-unreadable-cwd.fish
137/247 Test #142: init-command-mix.fish ....................   Passed    
        Start 145: invocation.fish
138/247 Test #143: init-command.fish ........................   Passed    
        Start 146: job-control-noninteractive.fish
139/247 Test #144: init-unreadable-cwd.fish .................   Passed    
        Start 147: job-control-not-a-tty.fish
140/247 Test #139: indent.fish ..............................   Passed    
        Start 148: job-ids.fish
141/247 Test #146: job-control-noninteractive.fish ..........   Passed    
        Start 149: jobs-are-escaped.fish
142/247 Test #147: job-control-not-a-tty.fish ...............   Passed    
        Start 150: jobs.fish
143/247 Test #145: invocation.fish ..........................   Passed    
        Start 151: line-continuation.fish
144/247 Test #148: job-ids.fish .............................   Passed    
        Start 152: line-number.fish
145/247 Test #149: jobs-are-escaped.fish ....................   Passed    
        Start 153: locale-numeric.fish
146/247 Test #151: line-continuation.fish ...................   Passed    
        Start 154: locale.fish
147/247 Test #152: line-number.fish .........................   Passed    
        Start 155: loops.fish
148/247 Test #136: git.fish .................................   Passed    
        Start 156: math.fish
149/247 Test #154: locale.fish ..............................   Passed    
        Start 157: no-config.fish
150/247 Test #155: loops.fish ...............................   Passed    
        Start 158: no-execute.fish
151/247 Test #156: math.fish ................................   Passed    
        Start 159: noshebang.fish
152/247 Test #157: no-config.fish ...........................   Passed    
        Start 160: not.fish
153/247 Test #158: no-execute.fish ..........................   Passed    
        Start 161: path.fish
154/247 Test #159: noshebang.fish ...........................   Passed    
        Start 162: pipeline-pgroup.fish
155/247 Test #160: not.fish .................................   Passed    
        Start 163: pipestatus.fish
156/247 Test #162: pipeline-pgroup.fish .....................   Passed    
        Start 164: printf.fish
157/247 Test #163: pipestatus.fish ..........................   Passed    
        Start 165: prompt.fish
158/247 Test  #96: check-completions.fish ...................***Failed    
        Start 166: psub.fish
159/247 Test #164: printf.fish ..............................   Passed    
        Start 167: random.fish
160/247 Test #153: locale-numeric.fish ......................   Passed    
        Start 168: rc-returned.fish
161/247 Test #165: prompt.fish ..............................   Passed    
        Start 169: read.fish
162/247 Test #168: rc-returned.fish .........................   Passed    
        Start 170: realpath.fish
163/247 Test #167: random.fish ..............................   Passed    
        Start 171: redirect.fish
164/247 Test #166: psub.fish ................................   Passed    
        Start 172: regex-import.fish
165/247 Test #169: read.fish ................................   Passed    
        Start 173: return.fish
166/247 Test #170: realpath.fish ............................   Passed    
        Start 174: scoping.fish
167/247 Test #172: regex-import.fish ........................   Passed    
        Start 175: self-signal-usr1.fish
168/247 Test #171: redirect.fish ............................   Passed    
        Start 176: set.fish
169/247 Test  #63: history_merge ............................   Passed    
        Start 177: setenv.fish
170/247 Test #173: return.fish ..............................   Passed    
        Start 178: sigint.fish
171/247 Test #174: scoping.fish .............................   Passed    
        Start 179: sigint2.fish
172/247 Test #175: self-signal-usr1.fish ....................   Passed    
        Start 180: signal.fish
173/247 Test #177: setenv.fish ..............................   Passed    
        Start 181: slices.fish
174/247 Test #180: signal.fish ..............................   Passed    
        Start 182: stack-overflow.fish
175/247 Test #181: slices.fish ..............................   Passed    
        Start 183: status-command.fish
176/247 Test #182: stack-overflow.fish ......................   Passed    
        Start 184: status-value.fish
177/247 Test #178: sigint.fish ..............................   Passed    
        Start 185: status.fish
178/247 Test #176: set.fish .................................   Passed    
        Start 186: string-advanced.fish
179/247 Test #183: status-command.fish ......................   Passed    
        Start 187: string.fish
180/247 Test #179: sigint2.fish .............................   Passed    
        Start 188: switch.fish
181/247 Test #184: status-value.fish ........................   Passed    
        Start 189: symlinks-not-overwritten.fish
182/247 Test #186: string-advanced.fish .....................   Passed    
        Start 190: syntax-error-location.fish
183/247 Test #185: status.fish ..............................   Passed    
        Start 191: test.fish
184/247 Test #188: switch.fish ..............................   Passed    
        Start 192: threads.fish
185/247 Test #189: symlinks-not-overwritten.fish ............   Passed    
        Start 193: time.fish
186/247 Test #192: threads.fish .............................   Passed    
        Start 194: tmux-abbr.fish
187/247 Test #191: test.fish ................................   Passed    
        Start 195: tmux-bind.fish
188/247 Test #190: syntax-error-location.fish ...............   Passed    
        Start 196: tmux-complete.fish
189/247 Test #193: time.fish ................................   Passed    
        Start 197: tmux-history-search.fish
190/247 Test  #95: check-all-fish-files.fish ................   Passed    
        Start 198: tmux-prompt.fish
191/247 Test #161: path.fish ................................***Failed    
  which failed to match line stdout:42:
        Start 199: trace.fish
192/247 Test #187: string.fish ..............................   Passed    
        Start 200: trap.fish
193/247 Test #195: tmux-bind.fish ...........................***Failed    
  which failed to match line stdout:1:
        Start 201: trap_print.fish
194/247 Test #199: trace.fish ...............................   Passed    
        Start 202: type.fish
195/247 Test #201: trap_print.fish ..........................   Passed    
        Start 203: ulimit.fish
196/247 Test #202: type.fish ................................   Passed    
        Start 204: umask.fish
197/247 Test #203: ulimit.fish ..............................   Passed    
        Start 205: variable-assignment.fish
198/247 Test #204: umask.fish ...............................   Passed    
        Start 206: vars_as_commands.fish
199/247 Test #205: variable-assignment.fish .................   Passed    
        Start 207: version.fish
200/247 Test #206: vars_as_commands.fish ....................   Passed    
        Start 208: wait.fish
201/247 Test #207: version.fish .............................   Passed    
        Start 209: wildcard.fish
202/247 Test #198: tmux-prompt.fish .........................***Failed    
  which failed to match line stdout:1:
        Start 210: wraps.fish
203/247 Test #209: wildcard.fish ............................   Passed    
        Start 211: zero_based_array.fish
204/247 Test #211: zero_based_array.fish ....................   Passed    
        Start 212: abbrs.py
205/247 Test #210: wraps.fish ...............................   Passed    
        Start 213: bind.py
206/247 Test #212: abbrs.py .................................   Passed    
        Start 214: bind_mode_events.py
207/247 Test #200: trap.fish ................................   Passed    
        Start 215: cancel_event.py
208/247 Test #194: tmux-abbr.fish ...........................***Failed    
  which failed to match line stdout:1:
        Start 216: commandline.py
209/247 Test #216: commandline.py ...........................   Passed    
        Start 217: complete-group-order.py
210/247 Test #197: tmux-history-search.fish .................***Failed    
  which failed to match line stdout:1:
        Start 218: complete.py
211/247 Test #215: cancel_event.py ..........................   Passed    
        Start 219: cursor_selection.py
212/247 Test #217: complete-group-order.py ..................   Passed    
        Start 220: disable_mouse.py
213/247 Test #214: bind_mode_events.py ......................   Passed    
        Start 221: eval-stack-overflow.py
214/247 Test #219: cursor_selection.py ......................   Passed    
        Start 222: exit.py
215/247 Test #220: disable_mouse.py .........................   Passed    
        Start 223: exit_handlers.py
216/247 Test #221: eval-stack-overflow.py ...................   Passed    
        Start 224: exit_nohang.py
217/247 Test #222: exit.py ..................................   Passed    
        Start 225: fg.py
218/247 Test #223: exit_handlers.py .........................   Passed    
        Start 226: fkr.py
219/247 Test #218: complete.py ..............................   Passed    
        Start 227: generic.py
220/247 Test #150: jobs.fish ................................   Passed    
        Start 228: histfile.py
221/247 Test #224: exit_nohang.py ...........................***Failed    
1 test failed
        Start 229: history.py
222/247 Test #196: tmux-complete.fish .......................***Failed    
  which failed to match line stdout:1:
        Start 230: isatty.py
223/247 Test #227: generic.py ...............................   Passed    
        Start 231: job_summary.py
224/247 Test #228: histfile.py ..............................   Passed    
        Start 232: nullterm.py
225/247 Test #208: wait.fish ................................   Passed    
        Start 233: pipeline.py
226/247 Test #230: isatty.py ................................   Passed    
        Start 234: postexec.py
227/247 Test #229: history.py ...............................   Passed    
        Start 235: private_mode.py
228/247 Test #232: nullterm.py ..............................   Passed    
        Start 236: read.py
229/247 Test #234: postexec.py ..............................   Passed    
        Start 237: set_color.py
230/247 Test #236: read.py ..................................   Passed    
        Start 238: sigint.py
231/247 Test #237: set_color.py .............................   Passed    
        Start 239: signals.py
232/247 Test #231: job_summary.py ...........................   Passed    
        Start 240: status.py
233/247 Test #240: status.py ................................   Passed    
        Start 241: stdin_nonblocking.py
234/247 Test #238: sigint.py ................................   Passed    
        Start 242: terminal.py
235/247 Test #213: bind.py ..................................   Passed    
        Start 243: torn_escapes.py
236/247 Test #241: stdin_nonblocking.py .....................   Passed    
        Start 244: tty_ownership.py
237/247 Test #235: private_mode.py ..........................   Passed    
        Start 245: undo.py
238/247 Test #243: torn_escapes.py ..........................   Passed    
        Start 246: wait.py
239/247 Test #244: tty_ownership.py .........................   Passed    
        Start 247: wildcard_tab.py
240/247 Test #245: undo.py ..................................   Passed    
241/247 Test #239: signals.py ...............................   Passed    
242/247 Test #233: pipeline.py ..............................   Passed    
243/247 Test #247: wildcard_tab.py ..........................   Passed    
244/247 Test #226: fkr.py ...................................***Failed    
Testing file pexpects/fkr.py:[31mFailed to match pattern:[39m [1mExiting\ at\ your\ request\.\\r\\n[0m
1 test failed
        Start  56: universal
 14/246 Test #245: wait.py ..................................   Passed    
        Start 246: wildcard_tab.py
 15/246 Test  #28: cancellation .............................   Passed    
        Start 238: signals.py
 16/246 Test #149: jobs.fish ................................   Passed    
        Start  97: check-translations.fish
 17/246 Test  #56: universal ................................   Passed    
        Start  26: debounce
 18/246 Test  #97: check-translations.fish ..................   Passed    
        Start  94: cd.fish
 19/246 Test #224: fg.py ....................................***Failed    
245/247 Test #246: wait.py ..................................   Passed    
246/247 Test #242: terminal.py ..............................***Failed    
Testing file pexpects/terminal.py:[31mFailed to match pattern:[39m [1mterm\-support:\ Terminal\ has\ 0\ columns,\ falling\ back\ to\ default\ width[0m
1 test failed
247/247 Test #225: fg.py ....................................***Failed    
Testing file pexpects/fg.py:[31mFailed to match pattern:[39m [1mSIGTSTP[0m
1 test failed
        Start 199: trap.fish
 20/246 Test  #63: history_merge ............................   Passed    
        Start 234: private_mode.py
 21/246 Test #246: wildcard_tab.py ..........................   Passed    
        Start   9: highlighting
 22/246 Test   #9: highlighting .............................   Passed    
        Start  19: convert_ascii
 23/246 Test #207: wait.fish ................................   Passed    
        Start 230: job_summary.py
 24/246 Test #232: pipeline.py ..............................   Passed    
        Start  18: convert
 25/246 Test #238: signals.py ...............................   Passed    
        Start 186: string.fish
 26/246 Test  #19: convert_ascii ............................   Passed    
        Start 217: complete.py
 27/246 Test  #94: cd.fish ..................................   Passed    
        Start 213: bind_mode_events.py
 28/246 Test  #26: debounce .................................   Passed    
        Start 136: git.fish
 29/246 Test #199: trap.fish ................................   Passed    
        Start 221: exit.py
 30/246 Test  #18: convert ..................................   Passed    
        Start  65: history_races
 31/246 Test #186: string.fish ..............................   Passed    
        Start 214: cancel_event.py
 32/246 Test #230: job_summary.py ...........................   Passed    
        Start 237: sigint.py
 33/246 Test #221: exit.py ..................................   Passed    
        Start 113: disown-parent.fish
 34/246 Test #136: git.fish .................................   Passed    
        Start 242: torn_escapes.py
 35/246 Test #213: bind_mode_events.py ......................   Passed    
        Start  80: re
 36/246 Test #217: complete.py ..............................   Passed    
        Start 240: stdin_nonblocking.py
 37/246 Test #234: private_mode.py ..........................   Passed    
        Start 227: histfile.py
 38/246 Test  #65: history_races ............................   Passed    
        Start 228: history.py
 39/246 Test #214: cancel_event.py ..........................   Passed    
        Start 235: read.py
 40/246 Test #237: sigint.py ................................   Passed    
        Start 226: generic.py
 41/246 Test #113: disown-parent.fish .......................   Passed    
        Start 152: locale-numeric.fish
 42/246 Test  #80: re .......................................   Passed    
        Start 175: set.fish
 43/246 Test #242: torn_escapes.py ..........................   Passed    
        Start 211: abbrs.py
 44/246 Test #152: locale-numeric.fish ......................   Passed    
        Start  11: new_parser_fuzzing
 45/246 Test #228: history.py ...............................   Passed    
        Start 233: postexec.py
 46/246 Test #227: histfile.py ..............................   Passed    
        Start 220: eval-stack-overflow.py
 47/246 Test #240: stdin_nonblocking.py .....................   Passed    
        Start 229: isatty.py
 48/246 Test #226: generic.py ...............................   Passed    
        Start 215: commandline.py
 49/246 Test #235: read.py ..................................   Passed    
        Start 178: sigint2.fish
 50/246 Test #175: set.fish .................................   Passed    
        Start 139: indent.fish
 51/246 Test  #11: new_parser_fuzzing .......................   Passed    
        Start 177: sigint.fish
 52/246 Test #178: sigint2.fish .............................   Passed    
        Start 243: tty_ownership.py
 53/246 Test #229: isatty.py ................................   Passed    
        Start 218: cursor_selection.py
 54/246 Test #233: postexec.py ..............................   Passed    
        Start 236: set_color.py
 55/246 Test #215: commandline.py ...........................   Passed    
        Start  16: escape
 56/246 Test #211: abbrs.py .................................   Passed    
        Start 239: status.py
 57/246 Test #220: eval-stack-overflow.py ...................   Passed    
        Start 244: undo.py
 58/246 Test #177: sigint.fish ..............................   Passed    
        Start 231: nullterm.py
 59/246 Test #139: indent.fish ..............................   Passed    
        Start 219: disable_mouse.py
 60/246 Test  #16: escape ...................................   Passed    
        Start 216: complete-group-order.py
 61/246 Test #243: tty_ownership.py .........................   Passed    
        Start 222: exit_handlers.py
 62/246 Test #244: undo.py ..................................   Passed    
        Start  88: basic.fish
 63/246 Test #218: cursor_selection.py ......................   Passed    
        Start 145: invocation.fish
 64/246 Test #239: status.py ................................   Passed    
        Start 119: expansion.fish
 65/246 Test #236: set_color.py .............................   Passed    
        Start 189: syntax-error-location.fish
 66/246 Test #189: syntax-error-location.fish ...............   Passed    
        Start 165: psub.fish
 67/246 Test #119: expansion.fish ...........................   Passed    
        Start 166: random.fish
 68/246 Test #231: nullterm.py ..............................   Passed    
        Start 168: read.fish
 69/246 Test #219: disable_mouse.py .........................   Passed    
        Start  23: fd_monitor
 70/246 Test #145: invocation.fish ..........................   Passed    
        Start  83: alias.fish
 71/246 Test  #88: basic.fish ...............................   Passed    
        Start 162: pipestatus.fish
 72/246 Test #216: complete-group-order.py ..................   Passed    
        Start 137: glob.fish
 73/246 Test #222: exit_handlers.py .........................   Passed    
        Start  82: abbr.fish
 74/246 Test  #23: fd_monitor ...............................   Passed    
        Start 203: umask.fish
 75/246 Test #168: read.fish ................................   Passed    
        Start 172: return.fish
 76/246 Test #165: psub.fish ................................   Passed    
        Start 170: redirect.fish
 77/246 Test #166: random.fish ..............................   Passed    
        Start 110: count.fish
 78/246 Test  #83: alias.fish ...............................   Passed    
        Start  86: argparse.fish
 79/246 Test #162: pipestatus.fish ..........................   Passed    
        Start 153: locale.fish
 80/246 Test #137: glob.fish ................................   Passed    
        Start 179: signal.fish
 81/246 Test  #82: abbr.fish ................................   Passed    
        Start  93: caller-observer.fish
 82/246 Test #203: umask.fish ...............................   Passed    
        Start 130: fish_add_path.fish
 83/246 Test #172: return.fish ..............................   Passed    
        Start 103: command-not-found.fish
 84/246 Test #110: count.fish ...............................   Passed    
        Start 120: fds.fish
 85/246 Test #170: redirect.fish ............................   Passed    
        Start 208: wildcard.fish
 86/246 Test  #93: caller-observer.fish .....................   Passed    
        Start 155: math.fish
 87/246 Test #153: locale.fish ..............................   Passed    
        Start  90: braces.fish
 88/246 Test  #86: argparse.fish ............................   Passed    
        Start 164: prompt.fish
 89/246 Test #179: signal.fish ..............................   Passed    
        Start 135: functions.fish
 90/246 Test #130: fish_add_path.fish .......................   Passed    
        Start  47: word_motion
 91/246 Test  #47: word_motion ..............................   Passed    
        Start 108: complete_directories.fish
 92/246 Test #208: wildcard.fish ............................   Passed    
        Start 144: init-unreadable-cwd.fish
 93/246 Test #120: fds.fish .................................   Passed    
        Start 161: pipeline-pgroup.fish
 94/246 Test #103: command-not-found.fish ...................   Passed    
        Start 157: no-execute.fish
 95/246 Test  #90: braces.fish ..............................   Passed    
        Start  46: pager_layout
 96/246 Test #164: prompt.fish ..............................   Passed    
        Start 169: realpath.fish
 97/246 Test #155: math.fish ................................   Passed    
        Start 134: function.fish
 98/246 Test #135: functions.fish ...........................   Passed    
        Start 205: vars_as_commands.fish
 99/246 Test  #46: pager_layout .............................   Passed    
        Start 146: job-control-noninteractive.fish
100/246 Test #108: complete_directories.fish ................   Passed    
        Start 192: time.fish
101/246 Test #144: init-unreadable-cwd.fish .................   Passed    
        Start 188: symlinks-not-overwritten.fish
102/246 Test #157: no-execute.fish ..........................   Passed    
        Start 131: fish_user_paths.fish
103/246 Test #161: pipeline-pgroup.fish .....................   Passed    
        Start 109: contains_opt.fish
104/246 Test #169: realpath.fish ............................   Passed    
        Start 138: history.fish
105/246 Test #134: function.fish ............................   Passed    
        Start  74: topics
106/246 Test #205: vars_as_commands.fish ....................   Passed    
        Start 100: colon-delimited-var.fish
107/246 Test #146: job-control-noninteractive.fish ..........   Passed    
        Start 171: regex-import.fish
108/246 Test #192: time.fish ................................   Passed    
        Start  91: broken-config.fish
109/246 Test #131: fish_user_paths.fish .....................   Passed    
        Start 154: loops.fish
110/246 Test #109: contains_opt.fish ........................   Passed    
        Start  84: andandoror.fish
111/246 Test #188: symlinks-not-overwritten.fish ............   Passed    
        Start  20: perf_convert_ascii
112/246 Test #138: history.fish .............................   Passed    
        Start 182: status-command.fish
113/246 Test #100: colon-delimited-var.fish .................   Passed    
        Start  98: cmdsub-limit.fish
114/246 Test #171: regex-import.fish ........................   Passed    
        Start 143: init-command.fish
115/246 Test  #84: andandoror.fish ..........................   Passed    
        Start 121: features-ampersand-nobg-in-token1.fish
116/246 Test  #91: broken-config.fish .......................   Passed    
        Start 148: job-ids.fish
117/246 Test #154: loops.fish ...............................   Passed    
        Start 123: features-nocaret2.fish
118/246 Test  #74: topics ...................................   Passed    
        Start 133: function-definition.fish
119/246 Test  #20: perf_convert_ascii .......................   Passed    
        Start 176: setenv.fish
120/246 Test  #98: cmdsub-limit.fish ........................   Passed    
        Start 105: commandline.fish
121/246 Test #143: init-command.fish ........................   Passed    
        Start 104: command-vars-persist.fish
122/246 Test #182: status-command.fish ......................   Passed    
        Start 187: switch.fish
123/246 Test #123: features-nocaret2.fish ...................   Passed    
        Start 181: stack-overflow.fish
124/246 Test #133: function-definition.fish .................   Passed    
        Start 112: directory-redirect.fish
125/246 Test #121: features-ampersand-nobg-in-token1.fish ...   Passed    
        Start 129: features-string-backslashes.fish
126/246 Test #148: job-ids.fish .............................   Passed    
        Start 111: deep-cmdsub.fish
127/246 Test #176: setenv.fish ..............................   Passed    
        Start 150: line-continuation.fish
128/246 Test #105: commandline.fish .........................   Passed    
        Start 173: scoping.fish
129/246 Test #104: command-vars-persist.fish ................   Passed    
        Start 126: features-qmark1.fish
130/246 Test #187: switch.fish ..............................   Passed    
        Start 128: features-string-backslashes-off.fish
131/246 Test #112: directory-redirect.fish ..................   Passed    
        Start 163: printf.fish
132/246 Test #129: features-string-backslashes.fish .........   Passed    
        Start 190: test.fish
133/246 Test #181: stack-overflow.fish ......................   Passed    
        Start 147: job-control-not-a-tty.fish
134/246 Test #111: deep-cmdsub.fish .........................   Passed    
        Start 167: rc-returned.fish
135/246 Test #150: line-continuation.fish ...................   Passed    
        Start 116: eval.fish
136/246 Test #126: features-qmark1.fish .....................   Passed    
        Start 184: status.fish
137/246 Test #173: scoping.fish .............................   Passed    
        Start 101: command-1.fish
138/246 Test #128: features-string-backslashes-off.fish .....   Passed    
        Start 127: features-qmark2.fish
139/246 Test #147: job-control-not-a-tty.fish ...............   Passed    
        Start 117: exec.fish
140/246 Test #163: printf.fish ..............................   Passed    
        Start 106: complete-group-order.fish
141/246 Test #190: test.fish ................................   Passed    
        Start 183: status-value.fish
142/246 Test #167: rc-returned.fish .........................   Passed    
        Start 174: self-signal-usr1.fish
143/246 Test #116: eval.fish ................................   Passed    
        Start 132: for.fish
144/246 Test #101: command-1.fish ...........................   Passed    
        Start 191: threads.fish
145/246 Test #184: status.fish ..............................   Passed    
        Start 122: features-nocaret1.fish
146/246 Test #127: features-qmark2.fish .....................   Passed    
        Start 115: env.fish
147/246 Test #117: exec.fish ................................   Passed    
        Start 158: noshebang.fish
148/246 Test #106: complete-group-order.fish ................   Passed    
        Start  99: cmdsub.fish
149/246 Test #183: status-value.fish ........................   Passed    
        Start 204: variable-assignment.fish
150/246 Test #174: self-signal-usr1.fish ....................   Passed    
        Start 142: init-command-mix.fish
151/246 Test #132: for.fish .................................   Passed    
        Start  85: andor.fish
152/246 Test #191: threads.fish .............................   Passed    
        Start 125: features-nocaret4.fish
153/246 Test #122: features-nocaret1.fish ...................   Passed    
        Start 141: init-command-mix-ordering.fish
154/246 Test #115: env.fish .................................   Passed    
        Start  92: builtinbuiltin.fish
155/246 Test #158: noshebang.fish ...........................   Passed    
        Start 156: no-config.fish
156/246 Test #142: init-command-mix.fish ....................   Passed    
        Start 185: string-advanced.fish
157/246 Test  #99: cmdsub.fish ..............................   Passed    
        Start 209: wraps.fish
158/246 Test #204: variable-assignment.fish .................   Passed    
        Start 140: init-command-2.fish
159/246 Test #125: features-nocaret4.fish ...................   Passed    
        Start 124: features-nocaret3.fish
160/246 Test  #85: andor.fish ...............................   Passed    
        Start 118: exit-status-with-closing-stderr.fish
161/246 Test #141: init-command-mix-ordering.fish ...........   Passed    
        Start 114: empty.fish
162/246 Test  #92: builtinbuiltin.fish ......................   Passed    
        Start 159: not.fish
163/246 Test #156: no-config.fish ...........................   Passed    
        Start  89: bind.fish
164/246 Test #209: wraps.fish ...............................   Passed    
        Start 200: trap_print.fish
165/246 Test #185: string-advanced.fish .....................   Passed    
        Start 151: line-number.fish
166/246 Test #140: init-command-2.fish ......................   Passed    
        Start 180: slices.fish
167/246 Test #124: features-nocaret3.fish ...................   Passed    
        Start 201: type.fish
168/246 Test #118: exit-status-with-closing-stderr.fish .....   Passed    
        Start 102: command-2.fish
169/246 Test #114: empty.fish ...............................   Passed    
        Start  87: bad-option.fish
170/246 Test #159: not.fish .................................   Passed    
        Start 210: zero_based_array.fish
171/246 Test #151: line-number.fish .........................   Passed    
        Start 198: trace.fish
172/246 Test #200: trap_print.fish ..........................   Passed    
        Start 206: version.fish
173/246 Test  #89: bind.fish ................................   Passed    
        Start 202: ulimit.fish
174/246 Test #180: slices.fish ..............................   Passed    
        Start  35: expand
175/246 Test  #87: bad-option.fish ..........................   Passed    
        Start  61: autosuggest_suggest_special
176/246 Test #102: command-2.fish ...........................   Passed    
        Start  51: complete
177/246 Test #201: type.fish ................................   Passed    
        Start  75: pipes
178/246 Test #210: zero_based_array.fish ....................   Passed    
        Start  48: is_potential_path
179/246 Test  #75: pipes ....................................   Passed    
        Start  66: history_formats
180/246 Test  #35: expand ...................................   Passed    
        Start  52: autoload
181/246 Test #206: version.fish .............................   Passed    
        Start   6: env
182/246 Test  #48: is_potential_path ........................   Passed    
        Start  76: fd_event
183/246 Test #198: trace.fish ...............................   Passed    
        Start   4: wwrite_to_fd
184/246 Test #202: ulimit.fish ..............................   Passed    
        Start  62: history
185/246 Test  #51: complete .................................   Passed    
        Start  14: new_parser_errors
186/246 Test  #61: autosuggest_suggest_special ..............   Passed    
        Start   5: env_vars
187/246 Test  #66: history_formats ..........................   Passed    
        Start   8: enum
188/246 Test  #76: fd_event .................................   Passed    
        Start   2: dir_iter
189/246 Test   #4: wwrite_to_fd .............................   Passed    
        Start   1: utility_functions
190/246 Test   #6: env ......................................   Passed    
        Start  10: new_parser_ll2
191/246 Test  #14: new_parser_errors ........................   Passed    
        Start  17: format
192/246 Test  #52: autoload .................................   Passed    
        Start   3: string_split
193/246 Test  #62: history ..................................   Passed    
        Start  21: convert_nulls
194/246 Test   #5: env_vars .................................   Passed    
        Start   7: str_to_num
195/246 Test   #8: enum .....................................   Passed    
        Start  15: error_messages
196/246 Test   #2: dir_iter .................................   Passed    
        Start  27: parser
197/246 Test   #1: utility_functions ........................   Passed    
        Start  13: new_parser_ad_hoc
198/246 Test  #10: new_parser_ll2 ...........................   Passed    
        Start  29: indents
199/246 Test  #17: format ...................................   Passed    
        Start  12: new_parser_correctness
200/246 Test   #3: string_split .............................   Passed    
        Start  30: utf8
201/246 Test   #7: str_to_num ...............................   Passed    
        Start  22: tokenizer
202/246 Test  #21: convert_nulls ............................   Passed    
        Start  40: builtins/test
203/246 Test  #15: error_messages ...........................   Passed    
        Start  31: feature_flags
204/246 Test  #27: parser ...................................   Passed    
        Start  44: path
205/246 Test  #13: new_parser_ad_hoc ........................   Passed    
        Start  33: pcre2_escape
206/246 Test  #29: indents ..................................   Passed    
        Start  24: iothread
207/246 Test  #12: new_parser_correctness ...................   Passed    
        Start  43: dup2s
208/246 Test  #30: utf8 .....................................   Passed    
        Start  39: abbreviations
209/246 Test  #22: tokenizer ................................   Passed    
        Start  38: ifind_fuzzy
210/246 Test  #40: builtins/test ............................   Passed    
        Start  41: wcstod
211/246 Test  #31: feature_flags ............................   Passed    
        Start  25: pthread
212/246 Test  #44: path .....................................   Passed    
        Start  81: wgetopt
213/246 Test  #33: pcre2_escape .............................   Passed    
        Start  45: pager_navigation
214/246 Test  #24: iothread .................................   Passed    
        Start  58: completion_insertions
215/246 Test  #43: dup2s ....................................   Passed    
        Start  42: fish_wcstod_underscores
216/246 Test  #39: abbreviations ............................   Passed    
        Start  34: lru
217/246 Test  #38: ifind_fuzzy ..............................   Passed    
        Start  37: ifind
218/246 Test  #41: wcstod ...................................   Passed    
        Start  71: prompt
219/246 Test  #25: pthread ..................................   Passed    
        Start  67: string
220/246 Test  #81: wgetopt ..................................   Passed    
        Start  55: undo
221/246 Test  #45: pager_navigation .........................   Passed    
        Start  36: fuzzy_match
222/246 Test  #58: completion_insertions ....................   Passed    
        Start  57: wait_handles
223/246 Test  #42: fish_wcstod_underscores ..................   Passed    
        Start  68: illegal_command_exit_code
224/246 Test  #37: ifind ....................................   Passed    
        Start  72: normalize
225/246 Test  #34: lru ......................................   Passed    
        Start  32: escape_sequences
226/246 Test  #71: prompt ...................................   Passed    
        Start  69: maybe
227/246 Test  #67: string ...................................   Passed    
        Start  77: timer_format
228/246 Test  #36: fuzzy_match ..............................   Passed    
        Start  73: dirname
229/246 Test  #55: undo .....................................   Passed    
        Start  79: killring
230/246 Test  #68: illegal_command_exit_code ................   Passed    
        Start  70: layout_cache
231/246 Test  #57: wait_handles .............................   Passed    
        Start  59: autosuggestion_ignores
232/246 Test  #72: normalize ................................   Passed    
        Start  64: history_paths
233/246 Test  #32: escape_sequences .........................   Passed    
        Start  78: termsize
234/246 Test  #69: maybe ....................................   Passed    
        Start  49: colors
235/246 Test  #73: dirname ..................................   Passed    
        Start  60: autosuggestion_combining
236/246 Test  #77: timer_format .............................   Passed    
        Start  50: wildcard
237/246 Test  #79: killring .................................   Passed    
        Start  53: input
238/246 Test  #70: layout_cache .............................   Passed    
        Start  54: line_iterator
239/246 Test  #59: autosuggestion_ignores ...................   Passed    
240/246 Test  #78: termsize .................................   Passed    
241/246 Test  #64: history_paths ............................   Passed    
242/246 Test  #49: colors ...................................   Passed    
243/246 Test  #50: wildcard .................................   Passed    
244/246 Test  #60: autosuggestion_combining .................   Passed    
245/246 Test  #53: input ....................................   Passed    
246/246 Test  #54: line_iterator ............................   Passed    
95% tests passed, 12 tests failed out of 246
95% tests passed, 12 tests failed out of 247
     96 - check-completions.fish (Failed)
    107 - complete.fish (Failed)
    160 - path.fish (Failed)
    193 - tmux-abbr.fish (Failed)
    194 - tmux-bind.fish (Failed)
    195 - tmux-complete.fish (Failed)
    196 - tmux-history-search.fish (Failed)
    197 - tmux-prompt.fish (Failed)
    223 - exit_nohang.py (Failed)
    224 - fg.py (Failed)
    225 - fkr.py (Failed)
    241 - terminal.py (Failed)
    161 - path.fish (Failed)
    194 - tmux-abbr.fish (Failed)
    195 - tmux-bind.fish (Failed)
    196 - tmux-complete.fish (Failed)
    197 - tmux-history-search.fish (Failed)
    198 - tmux-prompt.fish (Failed)
    224 - exit_nohang.py (Failed)
    225 - fg.py (Failed)
    226 - fkr.py (Failed)
    242 - terminal.py (Failed)

			@@ -21,12 +21,12 @@
			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME= fish
			COMPONENT_VERSION= 3.6.4
			COMPONENT_VERSION= 3.7.0
			COMPONENT_SUMMARY= Fish is a smart and user-friendly command line shell
			COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
			COMPONENT_PROJECT_URL= https://fishshell.com
			COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
			COMPONENT_ARCHIVE_HASH= sha256:0f3f610e580de092fbe882c8aa76623ecf91bb16fdf0543241e6e90d5d4bc393
			COMPONENT_ARCHIVE_HASH= sha256:df1b7378b714f0690b285ed9e4e58afe270ac98dbc9ca5839589c1afcca33ab1
			COMPONENT_ARCHIVE_URL= https://github.com/fish-shell/fish-shell/releases/download/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
			COMPONENT_FMRI= shell/fish
			COMPONENT_CLASSIFICATION= System/Shells

			@@ -10,7 +10,7 @@
			#

			#
			# Copyright 2023 <contributor>
			# Copyright 2024 Andreas Wacknitz
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -85,6 +85,7 @@
			file path=usr/share/doc/fish/cmds/fish_clipboard_paste.html
			file path=usr/share/doc/fish/cmds/fish_command_not_found.html
			file path=usr/share/doc/fish/cmds/fish_config.html
			file path=usr/share/doc/fish/cmds/fish_default_key_bindings.html
			file path=usr/share/doc/fish/cmds/fish_delta.html
			file path=usr/share/doc/fish/cmds/fish_git_prompt.html
			file path=usr/share/doc/fish/cmds/fish_greeting.html
			@@ -101,6 +102,7 @@
			file path=usr/share/doc/fish/cmds/fish_title.html
			file path=usr/share/doc/fish/cmds/fish_update_completions.html
			file path=usr/share/doc/fish/cmds/fish_vcs_prompt.html
			file path=usr/share/doc/fish/cmds/fish_vi_key_bindings.html
			file path=usr/share/doc/fish/cmds/for.html
			file path=usr/share/doc/fish/cmds/funced.html
			file path=usr/share/doc/fish/cmds/funcsave.html
			@@ -175,6 +177,7 @@
			file path=usr/share/doc/fish/language.html
			file path=usr/share/doc/fish/license.html
			file path=usr/share/doc/fish/objects.inv
			file path=usr/share/doc/fish/prompt.html
			file path=usr/share/doc/fish/relnotes.html
			file path=usr/share/doc/fish/search.html
			file path=usr/share/doc/fish/searchindex.js
			@@ -201,6 +204,9 @@
			file path=usr/share/fish/completions/adb.fish
			file path=usr/share/fish/completions/adduser.fish
			file path=usr/share/fish/completions/adiff.fish
			file path=usr/share/fish/completions/age-keygen.fish
			file path=usr/share/fish/completions/age.fish
			file path=usr/share/fish/completions/airmon-ng.fish
			file path=usr/share/fish/completions/alias.fish
			file path=usr/share/fish/completions/als.fish
			file path=usr/share/fish/completions/alsactl.fish
			@@ -244,6 +250,7 @@
			file path=usr/share/fish/completions/apt-zip-list.fish
			file path=usr/share/fish/completions/apt.fish
			file path=usr/share/fish/completions/aptitude.fish
			file path=usr/share/fish/completions/ar.fish
			file path=usr/share/fish/completions/arc.fish
			file path=usr/share/fish/completions/archlinux-java.fish
			file path=usr/share/fish/completions/arepack.fish
			@@ -281,6 +288,7 @@
			file path=usr/share/fish/completions/bind.fish
			file path=usr/share/fish/completions/bison.fish
			file path=usr/share/fish/completions/black.fish
			file path=usr/share/fish/completions/blender.fish
			file path=usr/share/fish/completions/block.fish
			file path=usr/share/fish/completions/bluetoothctl.fish
			file path=usr/share/fish/completions/bootctl.fish
			@@ -296,6 +304,7 @@
			file path=usr/share/fish/completions/bundle.fish
			file path=usr/share/fish/completions/bunzip2.fish
			file path=usr/share/fish/completions/busctl.fish
			file path=usr/share/fish/completions/bws.fish
			file path=usr/share/fish/completions/bzcat.fish
			file path=usr/share/fish/completions/bzip2.fish
			file path=usr/share/fish/completions/bzip2recover.fish
			@@ -304,6 +313,7 @@
			file path=usr/share/fish/completions/cabal.fish
			file path=usr/share/fish/completions/caddy.fish
			file path=usr/share/fish/completions/caffeinate.fish
			file path=usr/share/fish/completions/calendar.fish
			file path=usr/share/fish/completions/camcontrol.fish
			file path=usr/share/fish/completions/cancel.fish
			file path=usr/share/fish/completions/canto.fish
			@@ -314,6 +324,7 @@
			file path=usr/share/fish/completions/cdh.fish
			file path=usr/share/fish/completions/cdrecord.fish
			file path=usr/share/fish/completions/cf.fish
			file path=usr/share/fish/completions/checkinstall.fish
			file path=usr/share/fish/completions/chgrp.fish
			file path=usr/share/fish/completions/chmod.fish
			file path=usr/share/fish/completions/choice.fish
			@@ -358,6 +369,7 @@
			file path=usr/share/fish/completions/cowthink.fish
			file path=usr/share/fish/completions/cp.fish
			file path=usr/share/fish/completions/cpupower.fish
			file path=usr/share/fish/completions/crc.fish
			file path=usr/share/fish/completions/create_ap.fish
			file path=usr/share/fish/completions/createdb.fish
			file path=usr/share/fish/completions/cryptsetup.fish
			@@ -402,6 +414,7 @@
			file path=usr/share/fish/completions/dnf.fish
			file path=usr/share/fish/completions/doas.fish
			file path=usr/share/fish/completions/docker.fish
			file path=usr/share/fish/completions/doctl.fish
			file path=usr/share/fish/completions/dolphin.fish
			file path=usr/share/fish/completions/dotnet.fish
			file path=usr/share/fish/completions/downgrade.fish
			@@ -498,6 +511,7 @@
			file path=usr/share/fish/completions/gem.fish
			file path=usr/share/fish/completions/gendarme.fish
			file path=usr/share/fish/completions/gh.fish
			file path=usr/share/fish/completions/gimp.fish
			file path=usr/share/fish/completions/gio.fish
			file path=usr/share/fish/completions/git-sizer.fish
			file path=usr/share/fish/completions/git.fish
			@@ -507,6 +521,7 @@
			file path=usr/share/fish/completions/godoc.fish
			file path=usr/share/fish/completions/gofmt.fish
			file path=usr/share/fish/completions/goimports.fish
			file path=usr/share/fish/completions/gojq.fish
			file path=usr/share/fish/completions/golint.fish
			file path=usr/share/fish/completions/gorename.fish
			file path=usr/share/fish/completions/gpasswd.fish
			@@ -517,6 +532,7 @@
			file path=usr/share/fish/completions/gping.fish
			file path=usr/share/fish/completions/gprof.fish
			file path=usr/share/fish/completions/gradle.fish
			file path=usr/share/fish/completions/gradlew.fish
			file path=usr/share/fish/completions/grep.fish
			file path=usr/share/fish/completions/gresource.fish
			file path=usr/share/fish/completions/groupadd.fish
			@@ -530,6 +546,7 @@
			file path=usr/share/fish/completions/gv.fish
			file path=usr/share/fish/completions/gvim.fish
			file path=usr/share/fish/completions/gvimdiff.fish
			file path=usr/share/fish/completions/gw.fish
			file path=usr/share/fish/completions/gzip.fish
			file path=usr/share/fish/completions/hashcat.fish
			file path=usr/share/fish/completions/head.fish
			@@ -543,11 +560,13 @@
			file path=usr/share/fish/completions/hjson.fish
			file path=usr/share/fish/completions/hledger.fish
			file path=usr/share/fish/completions/homectl.fish
			file path=usr/share/fish/completions/horcrux.fish
			file path=usr/share/fish/completions/hostnamectl.fish
			file path=usr/share/fish/completions/htop.fish
			file path=usr/share/fish/completions/hugo.fish
			file path=usr/share/fish/completions/hwinfo.fish
			file path=usr/share/fish/completions/i3-msg.fish
			file path=usr/share/fish/completions/ibmcloud.fish
			file path=usr/share/fish/completions/icdiff.fish
			file path=usr/share/fish/completions/iconv.fish
			file path=usr/share/fish/completions/id.fish
			@@ -570,7 +589,9 @@
			file path=usr/share/fish/completions/isatty.fish
			file path=usr/share/fish/completions/istioctl.fish
			file path=usr/share/fish/completions/iw.fish
			file path=usr/share/fish/completions/iwctl.fish
			file path=usr/share/fish/completions/j.fish
			file path=usr/share/fish/completions/java_home.fish
			file path=usr/share/fish/completions/jbake.fish
			file path=usr/share/fish/completions/jest.fish
			file path=usr/share/fish/completions/jhipster.fish
			@@ -590,11 +611,11 @@
			file path=usr/share/fish/completions/killall.fish
			file path=usr/share/fish/completions/kind.fish
			file path=usr/share/fish/completions/kitchen.fish
			file path=usr/share/fish/completions/kitty.fish
			file path=usr/share/fish/completions/kldload.fish
			file path=usr/share/fish/completions/kldunload.fish
			file path=usr/share/fish/completions/kmutil.fish
			file path=usr/share/fish/completions/konsole.fish
			file path=usr/share/fish/completions/krita.fish
			file path=usr/share/fish/completions/ksh.fish
			file path=usr/share/fish/completions/kubectl.fish
			file path=usr/share/fish/completions/latex.fish
			@@ -647,6 +668,7 @@
			file path=usr/share/fish/completions/math.fish
			file path=usr/share/fish/completions/matlab.fish
			file path=usr/share/fish/completions/mc.fish
			file path=usr/share/fish/completions/md-to-clip.fish
			file path=usr/share/fish/completions/md5sum.fish
			file path=usr/share/fish/completions/mdadm.fish
			file path=usr/share/fish/completions/mdbook.fish
			@@ -726,6 +748,7 @@
			file path=usr/share/fish/completions/nvram.fish
			file path=usr/share/fish/completions/objdump.fish
			file path=usr/share/fish/completions/obnam.fish
			file path=usr/share/fish/completions/oc.fish
			file path=usr/share/fish/completions/octave.fish
			file path=usr/share/fish/completions/oggenc.fish
			file path=usr/share/fish/completions/oksh.fish
			@@ -825,6 +848,8 @@
			file path=usr/share/fish/completions/python3.fish
			file path=usr/share/fish/completions/pzstd.fish
			file path=usr/share/fish/completions/qdbus.fish
			file path=usr/share/fish/completions/qjs.fish
			file path=usr/share/fish/completions/qjsc.fish
			file path=usr/share/fish/completions/qmk.fish
			file path=usr/share/fish/completions/qshell.fish
			file path=usr/share/fish/completions/qubes-gpg-client.fish
			@@ -847,6 +872,7 @@
			file path=usr/share/fish/completions/reg.fish
			file path=usr/share/fish/completions/reject.fish
			file path=usr/share/fish/completions/rejmerge.fish
			file path=usr/share/fish/completions/rename.fish
			file path=usr/share/fish/completions/renice.fish
			file path=usr/share/fish/completions/resolvectl.fish
			file path=usr/share/fish/completions/return.fish
			@@ -857,6 +883,7 @@
			file path=usr/share/fish/completions/rmmod.fish
			file path=usr/share/fish/completions/root.fish
			file path=usr/share/fish/completions/roswell.fish
			file path=usr/share/fish/completions/rpm-ostree.fish
			file path=usr/share/fish/completions/rpm.fish
			file path=usr/share/fish/completions/rst2html.fish
			file path=usr/share/fish/completions/rst2html4.fish
			@@ -907,6 +934,7 @@
			file path=usr/share/fish/completions/sha512sum.fish
			file path=usr/share/fish/completions/shortcuts.fish
			file path=usr/share/fish/completions/signify.fish
			file path=usr/share/fish/completions/smerge.fish
			file path=usr/share/fish/completions/snap.fish
			file path=usr/share/fish/completions/sops.fish
			file path=usr/share/fish/completions/sort.fish
			@@ -1002,6 +1030,7 @@
			file path=usr/share/fish/completions/usbip.fish
			file path=usr/share/fish/completions/useradd.fish
			file path=usr/share/fish/completions/userdbctl.fish
			file path=usr/share/fish/completions/userdel.fish
			file path=usr/share/fish/completions/usermod.fish
			file path=usr/share/fish/completions/vagrant.fish
			file path=usr/share/fish/completions/valgrind.fish
			@@ -1018,6 +1047,7 @@
			file path=usr/share/fish/completions/wait.fish
			file path=usr/share/fish/completions/wajig.fish
			file path=usr/share/fish/completions/watch.fish
			file path=usr/share/fish/completions/watchexec.fish
			file path=usr/share/fish/completions/wc.fish
			file path=usr/share/fish/completions/wesnoth.fish
			file path=usr/share/fish/completions/wg-quick.fish
			@@ -1036,6 +1066,7 @@
			file path=usr/share/fish/completions/wireshark.fish
			file path=usr/share/fish/completions/wish.fish
			file path=usr/share/fish/completions/wpa_cli.fish
			file path=usr/share/fish/completions/wpctl.fish
			file path=usr/share/fish/completions/wslpath.fish
			file path=usr/share/fish/completions/wvdial.fish
			file path=usr/share/fish/completions/xargs.fish
			@@ -1074,6 +1105,7 @@
			file path=usr/share/fish/completions/xsv.fish
			file path=usr/share/fish/completions/xterm.fish
			file path=usr/share/fish/completions/xviewer.fish
			file path=usr/share/fish/completions/xxd.fish
			file path=usr/share/fish/completions/xxh128sum.fish
			file path=usr/share/fish/completions/xxh32sum.fish
			file path=usr/share/fish/completions/xxh64sum.fish
			@@ -1086,6 +1118,14 @@
			file path=usr/share/fish/completions/yast2.fish
			file path=usr/share/fish/completions/ykman.fish
			file path=usr/share/fish/completions/yum.fish
			file path=usr/share/fish/completions/zabbix_agent2.fish
			file path=usr/share/fish/completions/zabbix_agentd.fish
			file path=usr/share/fish/completions/zabbix_get.fish
			file path=usr/share/fish/completions/zabbix_js.fish
			file path=usr/share/fish/completions/zabbix_proxy.fish
			file path=usr/share/fish/completions/zabbix_sender.fish
			file path=usr/share/fish/completions/zabbix_server.fish
			file path=usr/share/fish/completions/zabbix_web_service.fish
			file path=usr/share/fish/completions/zcat.fish
			file path=usr/share/fish/completions/zef.fish
			file path=usr/share/fish/completions/zfs.fish
			@@ -1104,6 +1144,7 @@
			file path=usr/share/fish/config.fish
			file path=usr/share/fish/functions/N_.fish
			file path=usr/share/fish/functions/__fish_any_arg_in.fish
			file path=usr/share/fish/functions/__fish_anypager.fish
			file path=usr/share/fish/functions/__fish_anypython.fish
			file path=usr/share/fish/functions/__fish_append.fish
			file path=usr/share/fish/functions/__fish_apropos.fish
			@@ -1272,6 +1313,7 @@
			file path=usr/share/fish/functions/fish_default_key_bindings.fish
			file path=usr/share/fish/functions/fish_default_mode_prompt.fish
			file path=usr/share/fish/functions/fish_delta.fish
			file path=usr/share/fish/functions/fish_fossil_prompt.fish
			file path=usr/share/fish/functions/fish_git_prompt.fish
			file path=usr/share/fish/functions/fish_greeting.fish
			file path=usr/share/fish/functions/fish_hg_prompt.fish
			@@ -1357,6 +1399,7 @@
			file path=usr/share/fish/man/man1/fish-for-bash-users.1
			file path=usr/share/fish/man/man1/fish-interactive.1
			file path=usr/share/fish/man/man1/fish-language.1
			file path=usr/share/fish/man/man1/fish-prompt-tutorial.1
			file path=usr/share/fish/man/man1/fish-releasenotes.1
			file path=usr/share/fish/man/man1/fish-tutorial.1
			file path=usr/share/fish/man/man1/fish.1
			@@ -1366,6 +1409,7 @@
			file path=usr/share/fish/man/man1/fish_clipboard_paste.1
			file path=usr/share/fish/man/man1/fish_command_not_found.1
			file path=usr/share/fish/man/man1/fish_config.1
			file path=usr/share/fish/man/man1/fish_default_key_bindings.1
			file path=usr/share/fish/man/man1/fish_delta.1
			file path=usr/share/fish/man/man1/fish_git_prompt.1
			file path=usr/share/fish/man/man1/fish_greeting.1
			@@ -1382,6 +1426,7 @@
			file path=usr/share/fish/man/man1/fish_title.1
			file path=usr/share/fish/man/man1/fish_update_completions.1
			file path=usr/share/fish/man/man1/fish_vcs_prompt.1
			file path=usr/share/fish/man/man1/fish_vi_key_bindings.1
			file path=usr/share/fish/man/man1/for.1
			file path=usr/share/fish/man/man1/funced.1
			file path=usr/share/fish/man/man1/funcsave.1
			@@ -1449,6 +1494,7 @@
			file path=usr/share/fish/tools/web_config/delete.png
			file path=usr/share/fish/tools/web_config/favicon.png
			file path=usr/share/fish/tools/web_config/fishconfig.css
			file path=usr/share/fish/tools/web_config/fishconfig_print.css
			file path=usr/share/fish/tools/web_config/index.html
			file path=usr/share/fish/tools/web_config/js/angular-route.js
			file path=usr/share/fish/tools/web_config/js/angular-sanitize.js

			@@ -10,7 +10,7 @@
			#

			#
			# Copyright 2023 <contributor>
			# Copyright 2024 <contributor>
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -85,6 +85,7 @@
			file path=usr/share/doc/fish/cmds/fish_clipboard_paste.html
			file path=usr/share/doc/fish/cmds/fish_command_not_found.html
			file path=usr/share/doc/fish/cmds/fish_config.html
			file path=usr/share/doc/fish/cmds/fish_default_key_bindings.html
			file path=usr/share/doc/fish/cmds/fish_delta.html
			file path=usr/share/doc/fish/cmds/fish_git_prompt.html
			file path=usr/share/doc/fish/cmds/fish_greeting.html
			@@ -101,6 +102,7 @@
			file path=usr/share/doc/fish/cmds/fish_title.html
			file path=usr/share/doc/fish/cmds/fish_update_completions.html
			file path=usr/share/doc/fish/cmds/fish_vcs_prompt.html
			file path=usr/share/doc/fish/cmds/fish_vi_key_bindings.html
			file path=usr/share/doc/fish/cmds/for.html
			file path=usr/share/doc/fish/cmds/funced.html
			file path=usr/share/doc/fish/cmds/funcsave.html
			@@ -175,6 +177,7 @@
			file path=usr/share/doc/fish/language.html
			file path=usr/share/doc/fish/license.html
			file path=usr/share/doc/fish/objects.inv
			file path=usr/share/doc/fish/prompt.html
			file path=usr/share/doc/fish/relnotes.html
			file path=usr/share/doc/fish/search.html
			file path=usr/share/doc/fish/searchindex.js
			@@ -201,6 +204,9 @@
			file path=usr/share/fish/completions/adb.fish
			file path=usr/share/fish/completions/adduser.fish
			file path=usr/share/fish/completions/adiff.fish
			file path=usr/share/fish/completions/age-keygen.fish
			file path=usr/share/fish/completions/age.fish
			file path=usr/share/fish/completions/airmon-ng.fish
			file path=usr/share/fish/completions/alias.fish
			file path=usr/share/fish/completions/als.fish
			file path=usr/share/fish/completions/alsactl.fish
			@@ -244,6 +250,7 @@
			file path=usr/share/fish/completions/apt-zip-list.fish
			file path=usr/share/fish/completions/apt.fish
			file path=usr/share/fish/completions/aptitude.fish
			file path=usr/share/fish/completions/ar.fish
			file path=usr/share/fish/completions/arc.fish
			file path=usr/share/fish/completions/archlinux-java.fish
			file path=usr/share/fish/completions/arepack.fish
			@@ -281,6 +288,7 @@
			file path=usr/share/fish/completions/bind.fish
			file path=usr/share/fish/completions/bison.fish
			file path=usr/share/fish/completions/black.fish
			file path=usr/share/fish/completions/blender.fish
			file path=usr/share/fish/completions/block.fish
			file path=usr/share/fish/completions/bluetoothctl.fish
			file path=usr/share/fish/completions/bootctl.fish
			@@ -296,6 +304,7 @@
			file path=usr/share/fish/completions/bundle.fish
			file path=usr/share/fish/completions/bunzip2.fish
			file path=usr/share/fish/completions/busctl.fish
			file path=usr/share/fish/completions/bws.fish
			file path=usr/share/fish/completions/bzcat.fish
			file path=usr/share/fish/completions/bzip2.fish
			file path=usr/share/fish/completions/bzip2recover.fish
			@@ -304,6 +313,7 @@
			file path=usr/share/fish/completions/cabal.fish
			file path=usr/share/fish/completions/caddy.fish
			file path=usr/share/fish/completions/caffeinate.fish
			file path=usr/share/fish/completions/calendar.fish
			file path=usr/share/fish/completions/camcontrol.fish
			file path=usr/share/fish/completions/cancel.fish
			file path=usr/share/fish/completions/canto.fish
			@@ -314,6 +324,7 @@
			file path=usr/share/fish/completions/cdh.fish
			file path=usr/share/fish/completions/cdrecord.fish
			file path=usr/share/fish/completions/cf.fish
			file path=usr/share/fish/completions/checkinstall.fish
			file path=usr/share/fish/completions/chgrp.fish
			file path=usr/share/fish/completions/chmod.fish
			file path=usr/share/fish/completions/choice.fish
			@@ -358,6 +369,7 @@
			file path=usr/share/fish/completions/cowthink.fish
			file path=usr/share/fish/completions/cp.fish
			file path=usr/share/fish/completions/cpupower.fish
			file path=usr/share/fish/completions/crc.fish
			file path=usr/share/fish/completions/create_ap.fish
			file path=usr/share/fish/completions/createdb.fish
			file path=usr/share/fish/completions/cryptsetup.fish
			@@ -402,6 +414,7 @@
			file path=usr/share/fish/completions/dnf.fish
			file path=usr/share/fish/completions/doas.fish
			file path=usr/share/fish/completions/docker.fish
			file path=usr/share/fish/completions/doctl.fish
			file path=usr/share/fish/completions/dolphin.fish
			file path=usr/share/fish/completions/dotnet.fish
			file path=usr/share/fish/completions/downgrade.fish
			@@ -498,6 +511,7 @@
			file path=usr/share/fish/completions/gem.fish
			file path=usr/share/fish/completions/gendarme.fish
			file path=usr/share/fish/completions/gh.fish
			file path=usr/share/fish/completions/gimp.fish
			file path=usr/share/fish/completions/gio.fish
			file path=usr/share/fish/completions/git-sizer.fish
			file path=usr/share/fish/completions/git.fish
			@@ -507,6 +521,7 @@
			file path=usr/share/fish/completions/godoc.fish
			file path=usr/share/fish/completions/gofmt.fish
			file path=usr/share/fish/completions/goimports.fish
			file path=usr/share/fish/completions/gojq.fish
			file path=usr/share/fish/completions/golint.fish
			file path=usr/share/fish/completions/gorename.fish
			file path=usr/share/fish/completions/gpasswd.fish
			@@ -517,6 +532,7 @@
			file path=usr/share/fish/completions/gping.fish
			file path=usr/share/fish/completions/gprof.fish
			file path=usr/share/fish/completions/gradle.fish
			file path=usr/share/fish/completions/gradlew.fish
			file path=usr/share/fish/completions/grep.fish
			file path=usr/share/fish/completions/gresource.fish
			file path=usr/share/fish/completions/groupadd.fish
			@@ -530,6 +546,7 @@
			file path=usr/share/fish/completions/gv.fish
			file path=usr/share/fish/completions/gvim.fish
			file path=usr/share/fish/completions/gvimdiff.fish
			file path=usr/share/fish/completions/gw.fish
			file path=usr/share/fish/completions/gzip.fish
			file path=usr/share/fish/completions/hashcat.fish
			file path=usr/share/fish/completions/head.fish
			@@ -543,11 +560,13 @@
			file path=usr/share/fish/completions/hjson.fish
			file path=usr/share/fish/completions/hledger.fish
			file path=usr/share/fish/completions/homectl.fish
			file path=usr/share/fish/completions/horcrux.fish
			file path=usr/share/fish/completions/hostnamectl.fish
			file path=usr/share/fish/completions/htop.fish
			file path=usr/share/fish/completions/hugo.fish
			file path=usr/share/fish/completions/hwinfo.fish
			file path=usr/share/fish/completions/i3-msg.fish
			file path=usr/share/fish/completions/ibmcloud.fish
			file path=usr/share/fish/completions/icdiff.fish
			file path=usr/share/fish/completions/iconv.fish
			file path=usr/share/fish/completions/id.fish
			@@ -570,7 +589,9 @@
			file path=usr/share/fish/completions/isatty.fish
			file path=usr/share/fish/completions/istioctl.fish
			file path=usr/share/fish/completions/iw.fish
			file path=usr/share/fish/completions/iwctl.fish
			file path=usr/share/fish/completions/j.fish
			file path=usr/share/fish/completions/java_home.fish
			file path=usr/share/fish/completions/jbake.fish
			file path=usr/share/fish/completions/jest.fish
			file path=usr/share/fish/completions/jhipster.fish
			@@ -590,11 +611,11 @@
			file path=usr/share/fish/completions/killall.fish
			file path=usr/share/fish/completions/kind.fish
			file path=usr/share/fish/completions/kitchen.fish
			file path=usr/share/fish/completions/kitty.fish
			file path=usr/share/fish/completions/kldload.fish
			file path=usr/share/fish/completions/kldunload.fish
			file path=usr/share/fish/completions/kmutil.fish
			file path=usr/share/fish/completions/konsole.fish
			file path=usr/share/fish/completions/krita.fish
			file path=usr/share/fish/completions/ksh.fish
			file path=usr/share/fish/completions/kubectl.fish
			file path=usr/share/fish/completions/latex.fish
			@@ -647,6 +668,7 @@
			file path=usr/share/fish/completions/math.fish
			file path=usr/share/fish/completions/matlab.fish
			file path=usr/share/fish/completions/mc.fish
			file path=usr/share/fish/completions/md-to-clip.fish
			file path=usr/share/fish/completions/md5sum.fish
			file path=usr/share/fish/completions/mdadm.fish
			file path=usr/share/fish/completions/mdbook.fish
			@@ -726,6 +748,7 @@
			file path=usr/share/fish/completions/nvram.fish
			file path=usr/share/fish/completions/objdump.fish
			file path=usr/share/fish/completions/obnam.fish
			file path=usr/share/fish/completions/oc.fish
			file path=usr/share/fish/completions/octave.fish
			file path=usr/share/fish/completions/oggenc.fish
			file path=usr/share/fish/completions/oksh.fish
			@@ -825,6 +848,8 @@
			file path=usr/share/fish/completions/python3.fish
			file path=usr/share/fish/completions/pzstd.fish
			file path=usr/share/fish/completions/qdbus.fish
			file path=usr/share/fish/completions/qjs.fish
			file path=usr/share/fish/completions/qjsc.fish
			file path=usr/share/fish/completions/qmk.fish
			file path=usr/share/fish/completions/qshell.fish
			file path=usr/share/fish/completions/qubes-gpg-client.fish
			@@ -847,6 +872,7 @@
			file path=usr/share/fish/completions/reg.fish
			file path=usr/share/fish/completions/reject.fish
			file path=usr/share/fish/completions/rejmerge.fish
			file path=usr/share/fish/completions/rename.fish
			file path=usr/share/fish/completions/renice.fish
			file path=usr/share/fish/completions/resolvectl.fish
			file path=usr/share/fish/completions/return.fish
			@@ -857,6 +883,7 @@
			file path=usr/share/fish/completions/rmmod.fish
			file path=usr/share/fish/completions/root.fish
			file path=usr/share/fish/completions/roswell.fish
			file path=usr/share/fish/completions/rpm-ostree.fish
			file path=usr/share/fish/completions/rpm.fish
			file path=usr/share/fish/completions/rst2html.fish
			file path=usr/share/fish/completions/rst2html4.fish
			@@ -907,6 +934,7 @@
			file path=usr/share/fish/completions/sha512sum.fish
			file path=usr/share/fish/completions/shortcuts.fish
			file path=usr/share/fish/completions/signify.fish
			file path=usr/share/fish/completions/smerge.fish
			file path=usr/share/fish/completions/snap.fish
			file path=usr/share/fish/completions/sops.fish
			file path=usr/share/fish/completions/sort.fish
			@@ -1002,6 +1030,7 @@
			file path=usr/share/fish/completions/usbip.fish
			file path=usr/share/fish/completions/useradd.fish
			file path=usr/share/fish/completions/userdbctl.fish
			file path=usr/share/fish/completions/userdel.fish
			file path=usr/share/fish/completions/usermod.fish
			file path=usr/share/fish/completions/vagrant.fish
			file path=usr/share/fish/completions/valgrind.fish
			@@ -1018,6 +1047,7 @@
			file path=usr/share/fish/completions/wait.fish
			file path=usr/share/fish/completions/wajig.fish
			file path=usr/share/fish/completions/watch.fish
			file path=usr/share/fish/completions/watchexec.fish
			file path=usr/share/fish/completions/wc.fish
			file path=usr/share/fish/completions/wesnoth.fish
			file path=usr/share/fish/completions/wg-quick.fish
			@@ -1036,6 +1066,7 @@
			file path=usr/share/fish/completions/wireshark.fish
			file path=usr/share/fish/completions/wish.fish
			file path=usr/share/fish/completions/wpa_cli.fish
			file path=usr/share/fish/completions/wpctl.fish
			file path=usr/share/fish/completions/wslpath.fish
			file path=usr/share/fish/completions/wvdial.fish
			file path=usr/share/fish/completions/xargs.fish
			@@ -1074,6 +1105,7 @@
			file path=usr/share/fish/completions/xsv.fish
			file path=usr/share/fish/completions/xterm.fish
			file path=usr/share/fish/completions/xviewer.fish
			file path=usr/share/fish/completions/xxd.fish
			file path=usr/share/fish/completions/xxh128sum.fish
			file path=usr/share/fish/completions/xxh32sum.fish
			file path=usr/share/fish/completions/xxh64sum.fish
			@@ -1086,6 +1118,14 @@
			file path=usr/share/fish/completions/yast2.fish
			file path=usr/share/fish/completions/ykman.fish
			file path=usr/share/fish/completions/yum.fish
			file path=usr/share/fish/completions/zabbix_agent2.fish
			file path=usr/share/fish/completions/zabbix_agentd.fish
			file path=usr/share/fish/completions/zabbix_get.fish
			file path=usr/share/fish/completions/zabbix_js.fish
			file path=usr/share/fish/completions/zabbix_proxy.fish
			file path=usr/share/fish/completions/zabbix_sender.fish
			file path=usr/share/fish/completions/zabbix_server.fish
			file path=usr/share/fish/completions/zabbix_web_service.fish
			file path=usr/share/fish/completions/zcat.fish
			file path=usr/share/fish/completions/zef.fish
			file path=usr/share/fish/completions/zfs.fish
			@@ -1104,6 +1144,7 @@
			file path=usr/share/fish/config.fish
			file path=usr/share/fish/functions/N_.fish
			file path=usr/share/fish/functions/__fish_any_arg_in.fish
			file path=usr/share/fish/functions/__fish_anypager.fish
			file path=usr/share/fish/functions/__fish_anypython.fish
			file path=usr/share/fish/functions/__fish_append.fish
			file path=usr/share/fish/functions/__fish_apropos.fish
			@@ -1272,6 +1313,7 @@
			file path=usr/share/fish/functions/fish_default_key_bindings.fish
			file path=usr/share/fish/functions/fish_default_mode_prompt.fish
			file path=usr/share/fish/functions/fish_delta.fish
			file path=usr/share/fish/functions/fish_fossil_prompt.fish
			file path=usr/share/fish/functions/fish_git_prompt.fish
			file path=usr/share/fish/functions/fish_greeting.fish
			file path=usr/share/fish/functions/fish_hg_prompt.fish
			@@ -1357,6 +1399,7 @@
			file path=usr/share/fish/man/man1/fish-for-bash-users.1
			file path=usr/share/fish/man/man1/fish-interactive.1
			file path=usr/share/fish/man/man1/fish-language.1
			file path=usr/share/fish/man/man1/fish-prompt-tutorial.1
			file path=usr/share/fish/man/man1/fish-releasenotes.1
			file path=usr/share/fish/man/man1/fish-tutorial.1
			file path=usr/share/fish/man/man1/fish.1
			@@ -1366,6 +1409,7 @@
			file path=usr/share/fish/man/man1/fish_clipboard_paste.1
			file path=usr/share/fish/man/man1/fish_command_not_found.1
			file path=usr/share/fish/man/man1/fish_config.1
			file path=usr/share/fish/man/man1/fish_default_key_bindings.1
			file path=usr/share/fish/man/man1/fish_delta.1
			file path=usr/share/fish/man/man1/fish_git_prompt.1
			file path=usr/share/fish/man/man1/fish_greeting.1
			@@ -1382,6 +1426,7 @@
			file path=usr/share/fish/man/man1/fish_title.1
			file path=usr/share/fish/man/man1/fish_update_completions.1
			file path=usr/share/fish/man/man1/fish_vcs_prompt.1
			file path=usr/share/fish/man/man1/fish_vi_key_bindings.1
			file path=usr/share/fish/man/man1/for.1
			file path=usr/share/fish/man/man1/funced.1
			file path=usr/share/fish/man/man1/funcsave.1
			@@ -1449,6 +1494,7 @@
			file path=usr/share/fish/tools/web_config/delete.png
			file path=usr/share/fish/tools/web_config/favicon.png
			file path=usr/share/fish/tools/web_config/fishconfig.css
			file path=usr/share/fish/tools/web_config/fishconfig_print.css
			file path=usr/share/fish/tools/web_config/index.html
			file path=usr/share/fish/tools/web_config/js/angular-route.js
			file path=usr/share/fish/tools/web_config/js/angular-sanitize.js

			@@ -50,3 +50,14 @@
			} else if (entry->name == dirlinkname) {
			expected = dir_entry_type_t::dir;
			} else if (entry->name == badlinkname) {
			--- fish-3.7.0/src/wildcard.cpp.orig 2024-01-01 16:15:17.000000000 +0100
			+++ fish-3.7.0/src/wildcard.cpp 2024-01-01 20:23:37.471572632 +0100
			@@ -386,7 +386,7 @@
			}

			// regular file excludes broken links - we have no use for them as commands.
			- const bool is_regular_file = entry.check_type() == dir_entry_type_t::reg;
			+ const bool is_regular_file = entry.check_type() == dir_entry_type_t::regr;
			if (executables_only && (!is_regular_file \|\| waccess(filepath, X_OK) != 0)) {
			return false;
			}