From 00a18584953d08c271ba53f2aa4ef926016481fc Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Sat, 15 Apr 2023 04:12:12 -0400 Subject: [PATCH] fix(fish) docs are tougher to patch; and patch tries harder than git. --- .../fishshell.com/command_not_found_handler.diff | 13 ------------- projects/fishshell.com/package.yml | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/projects/fishshell.com/command_not_found_handler.diff b/projects/fishshell.com/command_not_found_handler.diff index 9399d1eb..b73c859d 100644 --- a/projects/fishshell.com/command_not_found_handler.diff +++ b/projects/fishshell.com/command_not_found_handler.diff @@ -1,16 +1,3 @@ -diff --git a/doc_src/language.rst b/doc_src/language.rst -index 16558cc8899..f3767415f8e 100644 ---- a/doc_src/language.rst -+++ b/doc_src/language.rst -@@ -1718,7 +1718,7 @@ In order: - - If the kernel knows how to run the file (e.g. via a ``#!`` line - ``#!/bin/sh`` or ``#!/usr/bin/python``), it does it. - - If the kernel reports that it couldn't run it because of a missing interpreter, and the file passes a rudimentary check, fish tells ``/bin/sh`` to run it. - --If none of these work, fish runs the function :doc:`fish_command_not_found ` and sets :envvar:`status` to 127. -+If none of these work, fish runs the function :doc:`fish_command_not_found `. - - You can use :doc:`type ` to see how fish resolved something:: - diff --git a/share/functions/fish_command_not_found.fish b/share/functions/fish_command_not_found.fish index 36ca2190553..77b3a78f7b9 100644 --- a/share/functions/fish_command_not_found.fish diff --git a/projects/fishshell.com/package.yml b/projects/fishshell.com/package.yml index d8e40e01..a7af129e 100644 --- a/projects/fishshell.com/package.yml +++ b/projects/fishshell.com/package.yml @@ -15,13 +15,13 @@ build: tea.xyz/gx/make: '*' cmake.org: '>=3.5' freedesktop.org/pkg-config: '*' - git-scm.org: '*' + gnu.org/patch: '*' script: | # By default, fish's fish_command_not_found handler will redirect to stderr, # return an exit code of 127. Always. This patch fixes it. Hopefully, it will # be merged upstream soon. https://github.com/fish-shell/fish-shell/pull/9517 - git apply props/command_not_found_handler.diff + patch -p1 version